Bug 491883 - Remove the ExtendedTypes framework

Change-Id: Ic057d8fef473b82d91e40237ad8d70db8cf07897

695 files changed, 218 insertions, 55598 deletions

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.classpath b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.classpath
deleted file mode 100644
index b1dabee3829..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/JavaSE-1.7"/>

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

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

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

-</classpath>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project
deleted file mode 100644
index ab73c06db46..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.customization.extendedtypes.emf</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>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9ca8e68231b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.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.7

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

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

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

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

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

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=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/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.settings/org.eclipse.jdt.ui.prefs b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.settings/org.eclipse.pde.api.tools.prefs b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF
deleted file mode 100644
index 1d587c3cd42..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.customization.extendedtypes;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: EMF Extended Types customization
-Bundle-Activator: org.eclipse.papyrus.customization.extendedtypes.emf.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.customization.extendedtypes.emf;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/about.html b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/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/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/build.properties b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/build.properties
deleted file mode 100644
index a6e783a9e73..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#

-#Wed Nov 05 15:21:48 CET 2014

-bin.includes = META-INF/,\

-               .,\

-               propertyView/,\

-               plugin.xml,\

-               about.html

-output..=bin/

-source..=src/

-src.includes = about.html

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/customizationConfiguration.xmi b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/customizationConfiguration.xmi
deleted file mode 100644
index e0a99a3eb9f..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/customizationConfiguration.xmi
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<custom:CustomizationConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:custom="http://www.eclipse.org/papyrus/customization" plugin="org.eclipse.papyrus.customization.extendedtypes.emf">

-  <elements xsi:type="custom:PropertyView" file="/models/properties/set/EMFExtendedTypes.ctx"/>

-</custom:CustomizationConfiguration>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/plugin.xml
deleted file mode 100644
index 75d436a809b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?eclipse version="3.4"?><plugin>

-<extension point="org.eclipse.papyrus.infra.properties.contexts">

-      <context contextModel="/propertyView/EMFExtendedTypes/EMFExtendedTypes.ctx"/>

-   </extension>

-</plugin>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/EMFExtendedTypes.ctx b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/EMFExtendedTypes.ctx
deleted file mode 100644
index fa052a74ea7..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/EMFExtendedTypes.ctx
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_XW1j4GT2EeSYLucr8QJGMw" name="EMFExtendedTypes" label="EMF Extended Element Types">
-  <dependencies href="ppe:/context/org.eclipse.papyrus.customization.extendedtypes//propertyView/ExtendedTypes/ExtendedTypes.ctx#_LxfSZGTrEeSnqN8Csryy_Q"/>
-  <tabs xmi:id="_XngdIGT2EeSYLucr8QJGMw" label="ExtendedTypes" id="extendedtypes" priority="100">
-    <sections xmi:id="_XngdIWT2EeSYLucr8QJGMw" name="Single SetValuesActionConfiguration" sectionFile="ui/SingleSetValuesActionConfiguration.xwt">
-      <widget href="ui/SingleSetValuesActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XngdImT2EeSYLucr8QJGMw" name="Single FeatureToSet" sectionFile="ui/SingleFeatureToSet.xwt">
-      <widget href="ui/SingleFeatureToSet.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XngdI2T2EeSYLucr8QJGMw" name="Single FeatureValue" sectionFile="ui/SingleFeatureValue.xwt">
-      <widget href="ui/SingleFeatureValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XngdJGT2EeSYLucr8QJGMw" name="Single DynamicValue" sectionFile="ui/SingleDynamicValue.xwt">
-      <widget href="ui/SingleDynamicValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XngdJWT2EeSYLucr8QJGMw" name="Single ConstantValue" sectionFile="ui/SingleConstantValue.xwt">
-      <widget href="ui/SingleConstantValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XngdJmT2EeSYLucr8QJGMw" name="Single ListValue" sectionFile="ui/SingleListValue.xwt">
-      <widget href="ui/SingleListValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XngdJ2T2EeSYLucr8QJGMw" name="Single QueryExecutionValue" sectionFile="ui/SingleQueryExecutionValue.xwt">
-      <widget href="ui/SingleQueryExecutionValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XngdKGT2EeSYLucr8QJGMw" name="Multiple SetValuesActionConfiguration" sectionFile="ui/MultipleSetValuesActionConfiguration.xwt">
-      <widget href="ui/MultipleSetValuesActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XnpnEGT2EeSYLucr8QJGMw" name="Multiple FeatureToSet" sectionFile="ui/MultipleFeatureToSet.xwt">
-      <widget href="ui/MultipleFeatureToSet.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XnpnEWT2EeSYLucr8QJGMw" name="Multiple FeatureValue" sectionFile="ui/MultipleFeatureValue.xwt">
-      <widget href="ui/MultipleFeatureValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XnpnEmT2EeSYLucr8QJGMw" name="Multiple DynamicValue" sectionFile="ui/MultipleDynamicValue.xwt">
-      <widget href="ui/MultipleDynamicValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XnpnE2T2EeSYLucr8QJGMw" name="Multiple ConstantValue" sectionFile="ui/MultipleConstantValue.xwt">
-      <widget href="ui/MultipleConstantValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XnpnFGT2EeSYLucr8QJGMw" name="Multiple ListValue" sectionFile="ui/MultipleListValue.xwt">
-      <widget href="ui/MultipleListValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_XnpnFWT2EeSYLucr8QJGMw" name="Multiple QueryExecutionValue" sectionFile="ui/MultipleQueryExecutionValue.xwt">
-      <widget href="ui/MultipleQueryExecutionValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_F5JlAWT2EeSYLucr8QJGMw" name="Single RuntimeValuesEditionActionConfiguration" sectionFile="ui/SingleRuntimeValuesEditionActionConfiguration.xwt">
-      <widget href="ui/SingleRuntimeValuesEditionActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_F5JlAmT2EeSYLucr8QJGMw" name="Single ViewToDisplay" sectionFile="ui/SingleViewToDisplay.xwt">
-      <widget href="ui/SingleViewToDisplay.xwt#/"/>
-    </sections>
-    <sections xmi:id="_F5JlA2T2EeSYLucr8QJGMw" name="Multiple RuntimeValuesEditionActionConfiguration" sectionFile="ui/MultipleRuntimeValuesEditionActionConfiguration.xwt">
-      <widget href="ui/MultipleRuntimeValuesEditionActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_F5JlBGT2EeSYLucr8QJGMw" name="Multiple ViewToDisplay" sectionFile="ui/MultipleViewToDisplay.xwt">
-      <widget href="ui/MultipleViewToDisplay.xwt#/"/>
-    </sections>
-  </tabs>
-  <views xmi:id="_XW1j4WT2EeSYLucr8QJGMw" name="Single SetValuesActionConfiguration" sections="_XngdIWT2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kGmT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1j4mT2EeSYLucr8QJGMw" name="isSingleSetValuesActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j42T2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j5GT2EeSYLucr8QJGMw" name="className" value="SetValuesActionConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1j5WT2EeSYLucr8QJGMw" name="Single FeatureToSet" sections="_XngdImT2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kHGT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1j5mT2EeSYLucr8QJGMw" name="isSingleFeatureToSet">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j52T2EeSYLucr8QJGMw" name="className" value="FeatureToSet"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j6GT2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1j6WT2EeSYLucr8QJGMw" name="Single FeatureValue" sections="_XngdI2T2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kH2T2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1j6mT2EeSYLucr8QJGMw" name="isSingleFeatureValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j62T2EeSYLucr8QJGMw" name="className" value="FeatureValue"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j7GT2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1j7WT2EeSYLucr8QJGMw" name="Single DynamicValue" sections="_XngdJGT2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kIGT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1j7mT2EeSYLucr8QJGMw" name="isSingleDynamicValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j72T2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j8GT2EeSYLucr8QJGMw" name="className" value="DynamicValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1j8WT2EeSYLucr8QJGMw" name="Single ConstantValue" sections="_XngdJWT2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kIWT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1j8mT2EeSYLucr8QJGMw" name="isSingleConstantValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j82T2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j9GT2EeSYLucr8QJGMw" name="className" value="ConstantValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1j9WT2EeSYLucr8QJGMw" name="Single ListValue" sections="_XngdJmT2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kI2T2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1j9mT2EeSYLucr8QJGMw" name="isSingleListValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j92T2EeSYLucr8QJGMw" name="className" value="ListValue"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j-GT2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1j-WT2EeSYLucr8QJGMw" name="Single QueryExecutionValue" sections="_XngdJ2T2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kJWT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1j-mT2EeSYLucr8QJGMw" name="isSingleQueryExecutionValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j-2T2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j_GT2EeSYLucr8QJGMw" name="className" value="QueryExecutionValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1j_WT2EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple SetValuesActionConfiguration" sections="_XngdKGT2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kGmT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1j_mT2EeSYLucr8QJGMw" name="isMultipleSetValuesActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1j_2T2EeSYLucr8QJGMw" name="className" value="SetValuesActionConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kAGT2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1kAWT2EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple FeatureToSet" sections="_XnpnEGT2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kHGT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1kAmT2EeSYLucr8QJGMw" name="isMultipleFeatureToSet">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kA2T2EeSYLucr8QJGMw" name="className" value="FeatureToSet"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kBGT2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1kBWT2EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple FeatureValue" sections="_XnpnEWT2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kH2T2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1kBmT2EeSYLucr8QJGMw" name="isMultipleFeatureValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kB2T2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kCGT2EeSYLucr8QJGMw" name="className" value="FeatureValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1kCWT2EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple DynamicValue" sections="_XnpnEmT2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kIGT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1kCmT2EeSYLucr8QJGMw" name="isMultipleDynamicValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kC2T2EeSYLucr8QJGMw" name="className" value="DynamicValue"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kDGT2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1kDWT2EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple ConstantValue" sections="_XnpnE2T2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kIWT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1kDmT2EeSYLucr8QJGMw" name="isMultipleConstantValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kD2T2EeSYLucr8QJGMw" name="className" value="ConstantValue"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kEGT2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1kEWT2EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple ListValue" sections="_XnpnFGT2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kI2T2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1kEmT2EeSYLucr8QJGMw" name="isMultipleListValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kE2T2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kFGT2EeSYLucr8QJGMw" name="className" value="ListValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_XW1kFWT2EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple QueryExecutionValue" sections="_XnpnFWT2EeSYLucr8QJGMw" automaticContext="true" datacontexts="_XW1kJWT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_XW1kFmT2EeSYLucr8QJGMw" name="isMultipleQueryExecutionValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kF2T2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_XW1kGGT2EeSYLucr8QJGMw" name="className" value="QueryExecutionValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_FoyNwWT2EeSYLucr8QJGMw" name="Single RuntimeValuesEditionActionConfiguration" automaticContext="true" datacontexts="_FoyN0mT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_FoyNwmT2EeSYLucr8QJGMw" name="isSingleRuntimeValuesEditionActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_FoyNw2T2EeSYLucr8QJGMw" name="className" value="RuntimeValuesEditionActionConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_FoyNxGT2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0"/>
-    </constraints>
-    <sections href="#_F5JlAWT2EeSYLucr8QJGMw"/>
-  </views>
-  <views xmi:id="_FoyNxWT2EeSYLucr8QJGMw" name="Single ViewToDisplay" automaticContext="true" datacontexts="_FoyN1GT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_FoyNxmT2EeSYLucr8QJGMw" name="isSingleViewToDisplay">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_FoyNx2T2EeSYLucr8QJGMw" name="className" value="ViewToDisplay"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_FoyNyGT2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0"/>
-    </constraints>
-    <sections href="#_F5JlAmT2EeSYLucr8QJGMw"/>
-  </views>
-  <views xmi:id="_FoyNyWT2EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple RuntimeValuesEditionActionConfiguration" automaticContext="true" datacontexts="_FoyN0mT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_FoyNymT2EeSYLucr8QJGMw" name="isMultipleRuntimeValuesEditionActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_FoyNy2T2EeSYLucr8QJGMw" name="className" value="RuntimeValuesEditionActionConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_FoyNzGT2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0"/>
-    </constraints>
-    <sections href="#_F5JlA2T2EeSYLucr8QJGMw"/>
-  </views>
-  <views xmi:id="_FoyNzWT2EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple ViewToDisplay" automaticContext="true" datacontexts="_FoyN1GT2EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_FoyNzmT2EeSYLucr8QJGMw" name="isMultipleViewToDisplay">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_FoyNz2T2EeSYLucr8QJGMw" name="className" value="ViewToDisplay"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_FoyN0GT2EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0"/>
-    </constraints>
-    <sections href="#_F5JlBGT2EeSYLucr8QJGMw"/>
-  </views>
-  <dataContexts xmi:id="_XW1kGWT2EeSYLucr8QJGMw" name="setvaluesactionconfiguration" label="setvaluesactionconfiguration">
-    <elements xmi:id="_XW1kGmT2EeSYLucr8QJGMw" name="SetValuesActionConfiguration">
-      <properties xmi:id="_XW1kG2T2EeSYLucr8QJGMw" name="featuresToSet" type="Reference" multiplicity="-1"/>
-    </elements>
-    <elements xmi:id="_XW1kHGT2EeSYLucr8QJGMw" name="FeatureToSet">
-      <properties xmi:id="_XW1kHWT2EeSYLucr8QJGMw" name="featureName"/>
-      <properties xmi:id="_XW1kHmT2EeSYLucr8QJGMw" name="value" type="Reference"/>
-    </elements>
-    <elements xmi:id="_XW1kH2T2EeSYLucr8QJGMw" name="FeatureValue"/>
-    <elements xmi:id="_XW1kIGT2EeSYLucr8QJGMw" name="DynamicValue" supertypes="_XW1kH2T2EeSYLucr8QJGMw"/>
-    <elements xmi:id="_XW1kIWT2EeSYLucr8QJGMw" name="ConstantValue" supertypes="_XW1kH2T2EeSYLucr8QJGMw">
-      <properties xmi:id="_XW1kImT2EeSYLucr8QJGMw" name="valueInstance" type="Reference"/>
-    </elements>
-    <elements xmi:id="_XW1kI2T2EeSYLucr8QJGMw" name="ListValue" supertypes="_XW1kH2T2EeSYLucr8QJGMw">
-      <properties xmi:id="_XW1kJGT2EeSYLucr8QJGMw" name="values" type="Reference" multiplicity="-1"/>
-    </elements>
-    <elements xmi:id="_XW1kJWT2EeSYLucr8QJGMw" name="QueryExecutionValue" supertypes="_XW1kIGT2EeSYLucr8QJGMw"/>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
-  </dataContexts>
-  <dataContexts xmi:id="_FoyN0WT2EeSYLucr8QJGMw" name="runtimevalueseditionactionconfiguration" label="runtimevalueseditionactionconfiguration">
-    <elements xmi:id="_FoyN0mT2EeSYLucr8QJGMw" name="RuntimeValuesEditionActionConfiguration">
-      <properties xmi:id="_FoyN02T2EeSYLucr8QJGMw" name="viewsToDisplay" type="Reference" multiplicity="-1"/>
-    </elements>
-    <elements xmi:id="_FoyN1GT2EeSYLucr8QJGMw" name="ViewToDisplay">
-      <properties xmi:id="_FoyN1WT2EeSYLucr8QJGMw" name="view" type="Reference"/>
-    </elements>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
-  </dataContexts>
-</contexts:Context>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleConstantValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleConstantValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleConstantValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleDynamicValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleDynamicValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleDynamicValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleFeatureToSet.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleFeatureToSet.xwt
deleted file mode 100644
index 2d251a2192c..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleFeatureToSet.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleFeatureValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleFeatureValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleFeatureValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleListValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleListValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleListValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleQueryExecutionValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleQueryExecutionValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleQueryExecutionValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleRuntimeValuesEditionActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleRuntimeValuesEditionActionConfiguration.xwt
deleted file mode 100644
index 71e2f0b09bf..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleRuntimeValuesEditionActionConfiguration.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleSetValuesActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleSetValuesActionConfiguration.xwt
deleted file mode 100644
index 44f3cd02f24..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleSetValuesActionConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleViewToDisplay.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleViewToDisplay.xwt
deleted file mode 100644
index 44f3cd02f24..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/MultipleViewToDisplay.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleConstantValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleConstantValue.xwt
deleted file mode 100644
index 6cb58001b1a..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleConstantValue.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleDynamicValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleDynamicValue.xwt
deleted file mode 100644
index 06715782ba9..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleDynamicValue.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleFeatureToSet.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleFeatureToSet.xwt
deleted file mode 100644
index e1b1780489e..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleFeatureToSet.xwt
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="setvaluesactionconfiguration:FeatureToSet:featureName"></ppe:StringEditor>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleFeatureValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleFeatureValue.xwt
deleted file mode 100644
index 68755b0d02e..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleFeatureValue.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleListValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleListValue.xwt
deleted file mode 100644
index e29bdbb8542..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleListValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleQueryExecutionValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleQueryExecutionValue.xwt
deleted file mode 100644
index 0073f7b1b90..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleQueryExecutionValue.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleRuntimeValuesEditionActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleRuntimeValuesEditionActionConfiguration.xwt
deleted file mode 100644
index 68755b0d02e..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleRuntimeValuesEditionActionConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleSetValuesActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleSetValuesActionConfiguration.xwt
deleted file mode 100644
index 8ee6141e132..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleSetValuesActionConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleViewToDisplay.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleViewToDisplay.xwt
deleted file mode 100644
index 3a60cf5057a..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/propertyView/EMFExtendedTypes/ui/SingleViewToDisplay.xwt
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="runtimevalueseditionactionconfiguration:ViewToDisplay:view"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/src/org/eclipse/papyrus/customization/extendedtypes/emf/Activator.java b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/src/org/eclipse/papyrus/customization/extendedtypes/emf/Activator.java
deleted file mode 100644
index 31d1c017186..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/src/org/eclipse/papyrus/customization/extendedtypes/emf/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.papyrus.customization.extendedtypes.emf;

-

-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.customization.extendedtypes.emf"; //$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)

-	 */

-	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)

-	 */

-	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/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.classpath b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.classpath
deleted file mode 100644
index b1dabee3829..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/JavaSE-1.7"/>

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

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

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

-</classpath>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project
deleted file mode 100644
index e9e8023ef9c..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.customization.extendedtypes.uml</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>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.settings/org.eclipse.jdt.core.prefs b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9ca8e68231b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.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.7

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

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

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

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

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

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=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/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.settings/org.eclipse.jdt.ui.prefs b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.settings/org.eclipse.pde.api.tools.prefs b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF
deleted file mode 100644
index 3ebe24c5f4e..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.customization.extendedtypes;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: UML ExtendedTypes Customization
-Bundle-Activator: org.eclipse.papyrus.customization.extendedtypes.uml.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.customization.extendedtypes.uml;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/about.html b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/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/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/build.properties b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/build.properties
deleted file mode 100644
index c8890c63e24..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#

-#Wed Nov 05 15:36:46 CET 2014

-bin.includes = META-INF/,\

-               .,\

-               propertyView/,\

-               plugin.xml,\

-               about.html

-output..=bin/

-source..=src/

-src.includes = about.html

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/customizationConfiguration.xmi b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/customizationConfiguration.xmi
deleted file mode 100644
index f4280f4ca7a..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/customizationConfiguration.xmi
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<custom:CustomizationConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:custom="http://www.eclipse.org/papyrus/customization" plugin="org.eclipse.papyrus.customization.extendedtypes.uml">

-  <elements xsi:type="custom:PropertyView" file="/models/properties/uml/UMLExtendedTypes.ctx"/>

-</custom:CustomizationConfiguration>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/plugin.xml
deleted file mode 100644
index 8acf0985ec7..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?eclipse version="3.4"?><plugin>

-<extension point="org.eclipse.papyrus.infra.properties.contexts">

-      <context contextModel="/propertyView/UMLExtendedTypes/UMLExtendedTypes.ctx"/>

-   </extension>

-</plugin>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/UMLExtendedTypes.ctx b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/UMLExtendedTypes.ctx
deleted file mode 100644
index 4cf1ba36104..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/UMLExtendedTypes.ctx
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_eFBoQGT4EeSYLucr8QJGMw" name="UMLExtendedTypes" label="UML Extended Element Types">
-  <dependencies href="ppe:/context/org.eclipse.papyrus.customization.extendedtypes//propertyView/ExtendedTypes/ExtendedTypes.ctx#_LxfSZGTrEeSnqN8Csryy_Q"/>
-  <tabs xmi:id="_elTDwGT4EeSYLucr8QJGMw" label="ExtendedTypes" id="extendedtypes" priority="100">
-    <sections xmi:id="_elTDwWT4EeSYLucr8QJGMw" name="Single ApplyStereotypeActionConfiguration" sectionFile="ui/SingleApplyStereotypeActionConfiguration.xwt">
-      <widget href="ui/SingleApplyStereotypeActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDwmT4EeSYLucr8QJGMw" name="Single StereotypeToApply" sectionFile="ui/SingleStereotypeToApply.xwt">
-      <widget href="ui/SingleStereotypeToApply.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDw2T4EeSYLucr8QJGMw" name="Single FeatureToSet" sectionFile="ui/SingleFeatureToSet.xwt">
-      <widget href="ui/SingleFeatureToSet.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDxGT4EeSYLucr8QJGMw" name="Single FeatureValue" sectionFile="ui/SingleFeatureValue.xwt">
-      <widget href="ui/SingleFeatureValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDxWT4EeSYLucr8QJGMw" name="Single ListValue" sectionFile="ui/SingleListValue.xwt">
-      <widget href="ui/SingleListValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDxmT4EeSYLucr8QJGMw" name="Single ConstantValue" sectionFile="ui/SingleConstantValue.xwt">
-      <widget href="ui/SingleConstantValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDx2T4EeSYLucr8QJGMw" name="Single DynamicValue" sectionFile="ui/SingleDynamicValue.xwt">
-      <widget href="ui/SingleDynamicValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDyGT4EeSYLucr8QJGMw" name="Single QueryExecutionValue" sectionFile="ui/SingleQueryExecutionValue.xwt">
-      <widget href="ui/SingleQueryExecutionValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDyWT4EeSYLucr8QJGMw" name="Multiple ApplyStereotypeActionConfiguration" sectionFile="ui/MultipleApplyStereotypeActionConfiguration.xwt">
-      <widget href="ui/MultipleApplyStereotypeActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDymT4EeSYLucr8QJGMw" name="Multiple StereotypeToApply" sectionFile="ui/MultipleStereotypeToApply.xwt">
-      <widget href="ui/MultipleStereotypeToApply.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDy2T4EeSYLucr8QJGMw" name="Multiple FeatureToSet" sectionFile="ui/MultipleFeatureToSet.xwt">
-      <widget href="ui/MultipleFeatureToSet.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDzGT4EeSYLucr8QJGMw" name="Multiple FeatureValue" sectionFile="ui/MultipleFeatureValue.xwt">
-      <widget href="ui/MultipleFeatureValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDzWT4EeSYLucr8QJGMw" name="Multiple ListValue" sectionFile="ui/MultipleListValue.xwt">
-      <widget href="ui/MultipleListValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDzmT4EeSYLucr8QJGMw" name="Multiple ConstantValue" sectionFile="ui/MultipleConstantValue.xwt">
-      <widget href="ui/MultipleConstantValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTDz2T4EeSYLucr8QJGMw" name="Multiple DynamicValue" sectionFile="ui/MultipleDynamicValue.xwt">
-      <widget href="ui/MultipleDynamicValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_elTD0GT4EeSYLucr8QJGMw" name="Multiple QueryExecutionValue" sectionFile="ui/MultipleQueryExecutionValue.xwt">
-      <widget href="ui/MultipleQueryExecutionValue.xwt#/"/>
-    </sections>
-    <sections xmi:id="_lXz5YWT4EeSYLucr8QJGMw" name="Single InvariantStereotypeConfiguration" sectionFile="ui/SingleInvariantStereotypeConfiguration.xwt">
-      <widget href="ui/SingleInvariantStereotypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_lXz5YmT4EeSYLucr8QJGMw" name="Multiple InvariantStereotypeConfiguration" sectionFile="ui/MultipleInvariantStereotypeConfiguration.xwt">
-      <widget href="ui/MultipleInvariantStereotypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_oP2dgWT4EeSYLucr8QJGMw" name="Single SetTypeActionConfiguration" sectionFile="ui/SingleSetTypeActionConfiguration.xwt">
-      <widget href="ui/SingleSetTypeActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_oP2dgmT4EeSYLucr8QJGMw" name="Multiple SetTypeActionConfiguration" sectionFile="ui/MultipleSetTypeActionConfiguration.xwt">
-      <widget href="ui/MultipleSetTypeActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_q7sYsWT4EeSYLucr8QJGMw" name="Single StereotypedElementMatcherConfiguration" sectionFile="ui/SingleStereotypedElementMatcherConfiguration.xwt">
-      <widget href="ui/SingleStereotypedElementMatcherConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_q7sYsmT4EeSYLucr8QJGMw" name="Multiple StereotypedElementMatcherConfiguration" sectionFile="ui/MultipleStereotypedElementMatcherConfiguration.xwt">
-      <widget href="ui/MultipleStereotypedElementMatcherConfiguration.xwt#/"/>
-    </sections>
-  </tabs>
-  <views xmi:id="_eFBoQWT4EeSYLucr8QJGMw" name="Single ApplyStereotypeActionConfiguration" sections="_elTDwWT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBogmT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoQmT4EeSYLucr8QJGMw" name="isSingleApplyStereotypeActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoQ2T4EeSYLucr8QJGMw" name="className" value="ApplyStereotypeActionConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoRGT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBoRWT4EeSYLucr8QJGMw" name="Single StereotypeToApply" sections="_elTDwmT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBohGT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoRmT4EeSYLucr8QJGMw" name="isSingleStereotypeToApply">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoR2T4EeSYLucr8QJGMw" name="className" value="StereotypeToApply"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoSGT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBoSWT4EeSYLucr8QJGMw" name="Single FeatureToSet" sections="_elTDw2T4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBoiWT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoSmT4EeSYLucr8QJGMw" name="isSingleFeatureToSet">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoS2T4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoTGT4EeSYLucr8QJGMw" name="className" value="FeatureToSet"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBoTWT4EeSYLucr8QJGMw" name="Single FeatureValue" sections="_elTDxGT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBojGT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoTmT4EeSYLucr8QJGMw" name="isSingleFeatureValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoT2T4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoUGT4EeSYLucr8QJGMw" name="className" value="FeatureValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBoUWT4EeSYLucr8QJGMw" name="Single ListValue" sections="_elTDxWT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBojWT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoUmT4EeSYLucr8QJGMw" name="isSingleListValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoU2T4EeSYLucr8QJGMw" name="className" value="ListValue"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoVGT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBoVWT4EeSYLucr8QJGMw" name="Single ConstantValue" sections="_elTDxmT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBoj2T4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoVmT4EeSYLucr8QJGMw" name="isSingleConstantValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoV2T4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoWGT4EeSYLucr8QJGMw" name="className" value="ConstantValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBoWWT4EeSYLucr8QJGMw" name="Single DynamicValue" sections="_elTDx2T4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBokWT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoWmT4EeSYLucr8QJGMw" name="isSingleDynamicValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoW2T4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoXGT4EeSYLucr8QJGMw" name="className" value="DynamicValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBoXWT4EeSYLucr8QJGMw" name="Single QueryExecutionValue" sections="_elTDyGT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBokmT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoXmT4EeSYLucr8QJGMw" name="isSingleQueryExecutionValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoX2T4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoYGT4EeSYLucr8QJGMw" name="className" value="QueryExecutionValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBoYWT4EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple ApplyStereotypeActionConfiguration" sections="_elTDyWT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBogmT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoYmT4EeSYLucr8QJGMw" name="isMultipleApplyStereotypeActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoY2T4EeSYLucr8QJGMw" name="className" value="ApplyStereotypeActionConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoZGT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBoZWT4EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple StereotypeToApply" sections="_elTDymT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBohGT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoZmT4EeSYLucr8QJGMw" name="isMultipleStereotypeToApply">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoZ2T4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoaGT4EeSYLucr8QJGMw" name="className" value="StereotypeToApply"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBoaWT4EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple FeatureToSet" sections="_elTDy2T4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBoiWT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoamT4EeSYLucr8QJGMw" name="isMultipleFeatureToSet">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoa2T4EeSYLucr8QJGMw" name="className" value="FeatureToSet"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBobGT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBobWT4EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple FeatureValue" sections="_elTDzGT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBojGT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBobmT4EeSYLucr8QJGMw" name="isMultipleFeatureValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBob2T4EeSYLucr8QJGMw" name="className" value="FeatureValue"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBocGT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBocWT4EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple ListValue" sections="_elTDzWT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBojWT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBocmT4EeSYLucr8QJGMw" name="isMultipleListValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoc2T4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBodGT4EeSYLucr8QJGMw" name="className" value="ListValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBodWT4EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple ConstantValue" sections="_elTDzmT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBoj2T4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBodmT4EeSYLucr8QJGMw" name="isMultipleConstantValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBod2T4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoeGT4EeSYLucr8QJGMw" name="className" value="ConstantValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBoeWT4EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple DynamicValue" sections="_elTDz2T4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBokWT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBoemT4EeSYLucr8QJGMw" name="isMultipleDynamicValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBoe2T4EeSYLucr8QJGMw" name="className" value="DynamicValue"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBofGT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_eFBofWT4EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple QueryExecutionValue" sections="_elTD0GT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_eFBokmT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_eFBofmT4EeSYLucr8QJGMw" name="isMultipleQueryExecutionValue">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBof2T4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_eFBogGT4EeSYLucr8QJGMw" name="className" value="QueryExecutionValue"/>
-    </constraints>
-  </views>
-  <views xmi:id="_qx3uUWT4EeSYLucr8QJGMw" name="Single StereotypedElementMatcherConfiguration" sections="_q7sYsWT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_qx3uWmT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_qx3uUmT4EeSYLucr8QJGMw" name="isSingleStereotypedElementMatcherConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_qx3uU2T4EeSYLucr8QJGMw" name="className" value="StereotypedElementMatcherConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_qx3uVGT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/payrus/extendedtypes/uml/stereotypematcherconfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_qx3uVWT4EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple StereotypedElementMatcherConfiguration" sections="_q7sYsmT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_qx3uWmT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_qx3uVmT4EeSYLucr8QJGMw" name="isMultipleStereotypedElementMatcherConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_qx3uV2T4EeSYLucr8QJGMw" name="className" value="StereotypedElementMatcherConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_qx3uWGT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/payrus/extendedtypes/uml/stereotypematcherconfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_oIHd0WT4EeSYLucr8QJGMw" name="Single SetTypeActionConfiguration" sections="_oP2dgWT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_oIHd2mT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_oIHd0mT4EeSYLucr8QJGMw" name="isSingleSetTypeActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_oIHd02T4EeSYLucr8QJGMw" name="className" value="SetTypeActionConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_oIHd1GT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/settypeaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_oIHd1WT4EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple SetTypeActionConfiguration" sections="_oP2dgmT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_oIHd2mT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_oIHd1mT4EeSYLucr8QJGMw" name="isMultipleSetTypeActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_oIHd12T4EeSYLucr8QJGMw" name="className" value="SetTypeActionConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_oIHd2GT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/settypeaction/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_lG_2MWT4EeSYLucr8QJGMw" name="Single InvariantStereotypeConfiguration" sections="_lXz5YWT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_lG_2OmT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_lG_2MmT4EeSYLucr8QJGMw" name="isSingleInvariantStereotypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_lG_2M2T4EeSYLucr8QJGMw" name="className" value="InvariantStereotypeConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_lG_2NGT4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/stereotype/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_lG_2NWT4EeSYLucr8QJGMw" elementMultiplicity="-1" name="Multiple InvariantStereotypeConfiguration" sections="_lXz5YmT4EeSYLucr8QJGMw" automaticContext="true" datacontexts="_lG_2OmT4EeSYLucr8QJGMw">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_lG_2NmT4EeSYLucr8QJGMw" name="isMultipleInvariantStereotypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_lG_2N2T4EeSYLucr8QJGMw" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/stereotype/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_lG_2OGT4EeSYLucr8QJGMw" name="className" value="InvariantStereotypeConfiguration"/>
-    </constraints>
-  </views>
-  <dataContexts xmi:id="_eFBogWT4EeSYLucr8QJGMw" name="applystereotypeactionconfiguration" label="applystereotypeactionconfiguration">
-    <elements xmi:id="_eFBogmT4EeSYLucr8QJGMw" name="ApplyStereotypeActionConfiguration">
-      <properties xmi:id="_eFBog2T4EeSYLucr8QJGMw" name="stereotypesToApply" type="Reference" multiplicity="-1"/>
-    </elements>
-    <elements xmi:id="_eFBohGT4EeSYLucr8QJGMw" name="StereotypeToApply">
-      <properties xmi:id="_eFBohWT4EeSYLucr8QJGMw" name="stereotypeQualifiedName"/>
-      <properties xmi:id="_eFBohmT4EeSYLucr8QJGMw" name="updateName" type="Boolean"/>
-      <properties xmi:id="_eFBoh2T4EeSYLucr8QJGMw" name="requiredProfiles" multiplicity="-1"/>
-      <properties xmi:id="_eFBoiGT4EeSYLucr8QJGMw" name="featuresToSet" type="Reference" multiplicity="-1"/>
-    </elements>
-    <elements xmi:id="_eFBoiWT4EeSYLucr8QJGMw" name="FeatureToSet">
-      <properties xmi:id="_eFBoimT4EeSYLucr8QJGMw" name="featureName"/>
-      <properties xmi:id="_eFBoi2T4EeSYLucr8QJGMw" name="value" type="Reference"/>
-    </elements>
-    <elements xmi:id="_eFBojGT4EeSYLucr8QJGMw" name="FeatureValue"/>
-    <elements xmi:id="_eFBojWT4EeSYLucr8QJGMw" name="ListValue" supertypes="_eFBojGT4EeSYLucr8QJGMw">
-      <properties xmi:id="_eFBojmT4EeSYLucr8QJGMw" name="values" type="Reference" multiplicity="-1"/>
-    </elements>
-    <elements xmi:id="_eFBoj2T4EeSYLucr8QJGMw" name="ConstantValue" supertypes="_eFBojGT4EeSYLucr8QJGMw">
-      <properties xmi:id="_eFBokGT4EeSYLucr8QJGMw" name="valueInstance" type="Reference"/>
-    </elements>
-    <elements xmi:id="_eFBokWT4EeSYLucr8QJGMw" name="DynamicValue" supertypes="_eFBojGT4EeSYLucr8QJGMw"/>
-    <elements xmi:id="_eFBokmT4EeSYLucr8QJGMw" name="QueryExecutionValue" supertypes="_eFBokWT4EeSYLucr8QJGMw"/>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
-  </dataContexts>
-  <dataContexts xmi:id="_qx3uWWT4EeSYLucr8QJGMw" name="stereotypedelementmatcherconfiguration" label="stereotypedelementmatcherconfiguration">
-    <elements xmi:id="_qx3uWmT4EeSYLucr8QJGMw" name="StereotypedElementMatcherConfiguration">
-      <properties xmi:id="_qx3uW2T4EeSYLucr8QJGMw" name="stereotypedQualifiedName"/>
-    </elements>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
-  </dataContexts>
-  <dataContexts xmi:id="_oIHd2WT4EeSYLucr8QJGMw" name="settypeactionconfiguration" label="settypeactionconfiguration">
-    <elements xmi:id="_oIHd2mT4EeSYLucr8QJGMw" name="SetTypeActionConfiguration">
-      <properties xmi:id="_oIHd22T4EeSYLucr8QJGMw" name="validTypes" multiplicity="-1"/>
-      <properties xmi:id="_oIHd3GT4EeSYLucr8QJGMw" name="creationTypes" multiplicity="-1"/>
-    </elements>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
-  </dataContexts>
-  <dataContexts xmi:id="_lG_2OWT4EeSYLucr8QJGMw" name="invariantstereotypeconfiguration" label="invariantstereotypeconfiguration">
-    <elements xmi:id="_lG_2OmT4EeSYLucr8QJGMw" name="InvariantStereotypeConfiguration">
-      <properties xmi:id="_lG_2O2T4EeSYLucr8QJGMw" name="stereotypeQualifiedName"/>
-      <properties xmi:id="_lG_2PGT4EeSYLucr8QJGMw" name="requiredProfile"/>
-    </elements>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
-  </dataContexts>
-</contexts:Context>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleApplyStereotypeActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleApplyStereotypeActionConfiguration.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleApplyStereotypeActionConfiguration.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleConstantValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleConstantValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleConstantValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleDynamicValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleDynamicValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleDynamicValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleFeatureToSet.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleFeatureToSet.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleFeatureToSet.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleFeatureValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleFeatureValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleFeatureValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleInvariantStereotypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleInvariantStereotypeConfiguration.xwt
deleted file mode 100644
index 371ca96ceee..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleInvariantStereotypeConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleListValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleListValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleListValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleQueryExecutionValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleQueryExecutionValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleQueryExecutionValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleSetTypeActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleSetTypeActionConfiguration.xwt
deleted file mode 100644
index c795cf2cc04..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleSetTypeActionConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleStereotypeToApply.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleStereotypeToApply.xwt
deleted file mode 100644
index ebc377b0661..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleStereotypeToApply.xwt
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="applystereotypeactionconfiguration:StereotypeToApply:updateName"></ppe:BooleanRadio>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleStereotypedElementMatcherConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleStereotypedElementMatcherConfiguration.xwt
deleted file mode 100644
index 78049e574ae..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/MultipleStereotypedElementMatcherConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleApplyStereotypeActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleApplyStereotypeActionConfiguration.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleApplyStereotypeActionConfiguration.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleConstantValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleConstantValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleConstantValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleDynamicValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleDynamicValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleDynamicValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleFeatureToSet.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleFeatureToSet.xwt
deleted file mode 100644
index a34c62d51a9..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleFeatureToSet.xwt
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="applystereotypeactionconfiguration:FeatureToSet:featureName"></ppe:StringEditor>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleFeatureValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleFeatureValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleFeatureValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleInvariantStereotypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleInvariantStereotypeConfiguration.xwt
deleted file mode 100644
index 9cc1605053b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleInvariantStereotypeConfiguration.xwt
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="invariantstereotypeconfiguration:InvariantStereotypeConfiguration:stereotypeQualifiedName"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="invariantstereotypeconfiguration:InvariantStereotypeConfiguration:requiredProfile"></ppe:StringEditor>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleListValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleListValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleListValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleQueryExecutionValue.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleQueryExecutionValue.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleQueryExecutionValue.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleSetTypeActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleSetTypeActionConfiguration.xwt
deleted file mode 100644
index 6bb48c2be93..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleSetTypeActionConfiguration.xwt
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiString input="{Binding}"
-			property="settypeactionconfiguration:SetTypeActionConfiguration:validTypes"></ppe:MultiString>
-		<ppe:MultiString input="{Binding}"
-			property="settypeactionconfiguration:SetTypeActionConfiguration:creationTypes"></ppe:MultiString>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleStereotypeToApply.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleStereotypeToApply.xwt
deleted file mode 100644
index 0380b43b5ad..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleStereotypeToApply.xwt
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="applystereotypeactionconfiguration:StereotypeToApply:stereotypeQualifiedName"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="applystereotypeactionconfiguration:StereotypeToApply:updateName"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiString input="{Binding}"
-			property="applystereotypeactionconfiguration:StereotypeToApply:requiredProfiles"></ppe:MultiString>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleStereotypedElementMatcherConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleStereotypedElementMatcherConfiguration.xwt
deleted file mode 100644
index 9faf34f27a1..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/propertyView/UMLExtendedTypes/ui/SingleStereotypedElementMatcherConfiguration.xwt
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="stereotypedelementmatcherconfiguration:StereotypedElementMatcherConfiguration:stereotypedQualifiedName"></ppe:StringEditor>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/src/org/eclipse/papyrus/customization/extendedtypes/uml/Activator.java b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/src/org/eclipse/papyrus/customization/extendedtypes/uml/Activator.java
deleted file mode 100644
index 04efa876643..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/src/org/eclipse/papyrus/customization/extendedtypes/uml/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.papyrus.customization.extendedtypes.uml;

-

-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.customization.extendedtypes.uml"; //$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)

-	 */

-	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)

-	 */

-	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/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.classpath b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.classpath
deleted file mode 100644
index b1dabee3829..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/JavaSE-1.7"/>

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

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

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

-</classpath>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project
deleted file mode 100644
index 26aeafb7969..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.customization.extendedtypes</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>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.settings/org.eclipse.jdt.core.prefs b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9ca8e68231b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.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.7

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

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

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

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

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

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=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/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.settings/org.eclipse.jdt.ui.prefs b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.settings/org.eclipse.pde.api.tools.prefs b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF
deleted file mode 100644
index f6b37ead789..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: Extendedtypes Customization
-Bundle-Activator: org.eclipse.papyrus.customization.extendedtypes.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.customization.extendedtypes;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/about.html b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/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/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/build.properties b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/build.properties
deleted file mode 100644
index 98fb11dfbe6..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#

-#Wed Nov 05 14:00:09 CET 2014

-bin.includes = META-INF/,\

-               .,\

-               propertyView/,\

-               plugin.xml,\

-               about.html

-output..=bin/

-source..=src/

-src.includes = about.html

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/plugin.xml
deleted file mode 100644
index becca600957..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?eclipse version="3.4"?><plugin>

-<extension point="org.eclipse.papyrus.infra.properties.contexts">

-      <context

-            contextModel="/propertyView/ExtendedTypes/ExtendedTypes.ctx"

-            isCustomizable="false"/>

-   </extension>

-</plugin>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ExtendedTypes.ctx b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ExtendedTypes.ctx
deleted file mode 100644
index 9f9203136d0..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ExtendedTypes.ctx
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_LxfSZGTrEeSnqN8Csryy_Q" name="ExtendedTypes" label="Core Extended Element Types">
-  <tabs xmi:id="_LxfSZWTrEeSnqN8Csryy_Q" label="ExtendedTypes" id="extendedtypes" priority="100">
-    <sections xmi:id="_LxfSZmTrEeSnqN8Csryy_Q" name="Single ExtendedElementTypeSet" sectionFile="ui/SingleExtendedElementTypeSet.xwt">
-      <widget href="ui/SingleExtendedElementTypeSet.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSZ2TrEeSnqN8Csryy_Q" name="Single ElementTypeConfiguration" sectionFile="ui/SingleElementTypeConfiguration.xwt">
-      <widget href="ui/SingleElementTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSaGTrEeSnqN8Csryy_Q" name="Single IconEntry" sectionFile="ui/SingleIconEntry.xwt">
-      <widget href="ui/SingleIconEntry.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSaWTrEeSnqN8Csryy_Q" name="Single ConfigurationElement" sectionFile="ui/SingleConfigurationElement.xwt">
-      <widget href="ui/SingleConfigurationElement.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSamTrEeSnqN8Csryy_Q" name="Single MatcherConfiguration" sectionFile="ui/SingleMatcherConfiguration.xwt">
-      <widget href="ui/SingleMatcherConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSa2TrEeSnqN8Csryy_Q" name="Single ActionConfiguration" sectionFile="ui/SingleActionConfiguration.xwt">
-      <widget href="ui/SingleActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSbGTrEeSnqN8Csryy_Q" name="Single ViewActionConfiguration" sectionFile="ui/SingleViewActionConfiguration.xwt">
-      <widget href="ui/SingleViewActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSbWTrEeSnqN8Csryy_Q" name="Single SemanticActionConfiguration" sectionFile="ui/SingleSemanticActionConfiguration.xwt">
-      <widget href="ui/SingleSemanticActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSbmTrEeSnqN8Csryy_Q" name="Single SemanticTypeConfiguration" sectionFile="ui/SingleSemanticTypeConfiguration.xwt">
-      <widget href="ui/SingleSemanticTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSb2TrEeSnqN8Csryy_Q" name="Single ViewTypeConfiguration" sectionFile="ui/SingleViewTypeConfiguration.xwt">
-      <widget href="ui/SingleViewTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfScGTrEeSnqN8Csryy_Q" name="Single ElementTypeAdviceConfiguration" sectionFile="ui/SingleElementTypeAdviceConfiguration.xwt">
-      <widget href="ui/SingleElementTypeAdviceConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfScWTrEeSnqN8Csryy_Q" name="Single AspectSemanticTypeConfiguration" sectionFile="ui/SingleAspectSemanticTypeConfiguration.xwt">
-      <widget href="ui/SingleAspectSemanticTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfScmTrEeSnqN8Csryy_Q" name="Single AspectViewTypeConfiguration" sectionFile="ui/SingleAspectViewTypeConfiguration.xwt">
-      <widget href="ui/SingleAspectViewTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSc2TrEeSnqN8Csryy_Q" name="Multiple ExtendedElementTypeSet" sectionFile="ui/MultipleExtendedElementTypeSet.xwt">
-      <widget href="ui/MultipleExtendedElementTypeSet.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSdGTrEeSnqN8Csryy_Q" name="Multiple ElementTypeConfiguration" sectionFile="ui/MultipleElementTypeConfiguration.xwt">
-      <widget href="ui/MultipleElementTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSdWTrEeSnqN8Csryy_Q" name="Multiple IconEntry" sectionFile="ui/MultipleIconEntry.xwt">
-      <widget href="ui/MultipleIconEntry.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSdmTrEeSnqN8Csryy_Q" name="Multiple ConfigurationElement" sectionFile="ui/MultipleConfigurationElement.xwt">
-      <widget href="ui/MultipleConfigurationElement.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSd2TrEeSnqN8Csryy_Q" name="Multiple MatcherConfiguration" sectionFile="ui/MultipleMatcherConfiguration.xwt">
-      <widget href="ui/MultipleMatcherConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSeGTrEeSnqN8Csryy_Q" name="Multiple ActionConfiguration" sectionFile="ui/MultipleActionConfiguration.xwt">
-      <widget href="ui/MultipleActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSeWTrEeSnqN8Csryy_Q" name="Multiple ViewActionConfiguration" sectionFile="ui/MultipleViewActionConfiguration.xwt">
-      <widget href="ui/MultipleViewActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSemTrEeSnqN8Csryy_Q" name="Multiple SemanticActionConfiguration" sectionFile="ui/MultipleSemanticActionConfiguration.xwt">
-      <widget href="ui/MultipleSemanticActionConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSe2TrEeSnqN8Csryy_Q" name="Multiple SemanticTypeConfiguration" sectionFile="ui/MultipleSemanticTypeConfiguration.xwt">
-      <widget href="ui/MultipleSemanticTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSfGTrEeSnqN8Csryy_Q" name="Multiple ViewTypeConfiguration" sectionFile="ui/MultipleViewTypeConfiguration.xwt">
-      <widget href="ui/MultipleViewTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSfWTrEeSnqN8Csryy_Q" name="Multiple ElementTypeAdviceConfiguration" sectionFile="ui/MultipleElementTypeAdviceConfiguration.xwt">
-      <widget href="ui/MultipleElementTypeAdviceConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSfmTrEeSnqN8Csryy_Q" name="Multiple AspectSemanticTypeConfiguration" sectionFile="ui/MultipleAspectSemanticTypeConfiguration.xwt">
-      <widget href="ui/MultipleAspectSemanticTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSf2TrEeSnqN8Csryy_Q" name="Multiple AspectViewTypeConfiguration" sectionFile="ui/MultipleAspectViewTypeConfiguration.xwt">
-      <widget href="ui/MultipleAspectViewTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSgGTrEeSnqN8Csryy_Q" name="Single InvariantContainerConfiguration" sectionFile="ui/SingleInvariantContainerConfiguration.xwt">
-      <widget href="ui/SingleInvariantContainerConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSgWTrEeSnqN8Csryy_Q" name="Single HierarchyPermission" sectionFile="ui/SingleHierarchyPermission.xwt">
-      <widget href="ui/SingleHierarchyPermission.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSgmTrEeSnqN8Csryy_Q" name="Multiple InvariantContainerConfiguration" sectionFile="ui/MultipleInvariantContainerConfiguration.xwt">
-      <widget href="ui/MultipleInvariantContainerConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSg2TrEeSnqN8Csryy_Q" name="Multiple HierarchyPermission" sectionFile="ui/MultipleHierarchyPermission.xwt">
-      <widget href="ui/MultipleHierarchyPermission.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfShGTrEeSnqN8Csryy_Q" name="Single InvariantSemanticTypeConfiguration" sectionFile="ui/SingleInvariantSemanticTypeConfiguration.xwt">
-      <widget href="ui/SingleInvariantSemanticTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfShWTrEeSnqN8Csryy_Q" name="Single InvariantRuleConfiguration" sectionFile="ui/SingleInvariantRuleConfiguration.xwt">
-      <widget href="ui/SingleInvariantRuleConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfShmTrEeSnqN8Csryy_Q" name="Single ComposedRuleConfiguration" sectionFile="ui/SingleComposedRuleConfiguration.xwt">
-      <widget href="ui/SingleComposedRuleConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSh2TrEeSnqN8Csryy_Q" name="Single AndRule" sectionFile="ui/SingleAndRule.xwt">
-      <widget href="ui/SingleAndRule.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSiGTrEeSnqN8Csryy_Q" name="Single OrRule" sectionFile="ui/SingleOrRule.xwt">
-      <widget href="ui/SingleOrRule.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSiWTrEeSnqN8Csryy_Q" name="Multiple InvariantSemanticTypeConfiguration" sectionFile="ui/MultipleInvariantSemanticTypeConfiguration.xwt">
-      <widget href="ui/MultipleInvariantSemanticTypeConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSimTrEeSnqN8Csryy_Q" name="Multiple InvariantRuleConfiguration" sectionFile="ui/MultipleInvariantRuleConfiguration.xwt">
-      <widget href="ui/MultipleInvariantRuleConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSi2TrEeSnqN8Csryy_Q" name="Multiple ComposedRuleConfiguration" sectionFile="ui/MultipleComposedRuleConfiguration.xwt">
-      <widget href="ui/MultipleComposedRuleConfiguration.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSjGTrEeSnqN8Csryy_Q" name="Multiple AndRule" sectionFile="ui/MultipleAndRule.xwt">
-      <widget href="ui/MultipleAndRule.xwt#/"/>
-    </sections>
-    <sections xmi:id="_LxfSjWTrEeSnqN8Csryy_Q" name="Multiple OrRule" sectionFile="ui/MultipleOrRule.xwt">
-      <widget href="ui/MultipleOrRule.xwt#/"/>
-    </sections>
-  </tabs>
-  <views xmi:id="_LxfSjmTrEeSnqN8Csryy_Q" name="Single ExtendedElementTypeSet" sections="_LxfSZmTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTL2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSj2TrEeSnqN8Csryy_Q" name="isSingleExtendedElementTypeSet">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSkGTrEeSnqN8Csryy_Q" name="className" value="ExtendedElementTypeSet"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSkWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSkmTrEeSnqN8Csryy_Q" name="Single ElementTypeConfiguration" sections="_LxfSZ2TrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTMmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSk2TrEeSnqN8Csryy_Q" name="isSingleElementTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSlGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSlWTrEeSnqN8Csryy_Q" name="className" value="ElementTypeConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSlmTrEeSnqN8Csryy_Q" name="Single IconEntry" sections="_LxfSaGTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTN2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSl2TrEeSnqN8Csryy_Q" name="isSingleIconEntry">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSmGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSmWTrEeSnqN8Csryy_Q" name="className" value="IconEntry"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSmmTrEeSnqN8Csryy_Q" name="Single ConfigurationElement" sections="_LxfSaWTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTOmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSm2TrEeSnqN8Csryy_Q" name="isSingleConfigurationElement">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSnGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSnWTrEeSnqN8Csryy_Q" name="className" value="ConfigurationElement"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSnmTrEeSnqN8Csryy_Q" name="Single MatcherConfiguration" sections="_LxfSamTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTP2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSn2TrEeSnqN8Csryy_Q" name="isSingleMatcherConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSoGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSoWTrEeSnqN8Csryy_Q" name="className" value="MatcherConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSomTrEeSnqN8Csryy_Q" name="Single ActionConfiguration" sections="_LxfSa2TrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTQGTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSo2TrEeSnqN8Csryy_Q" name="isSingleActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSpGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSpWTrEeSnqN8Csryy_Q" name="className" value="ActionConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSpmTrEeSnqN8Csryy_Q" name="Single ViewActionConfiguration" sections="_LxfSbGTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTQWTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSp2TrEeSnqN8Csryy_Q" name="isSingleViewActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSqGTrEeSnqN8Csryy_Q" name="className" value="ViewActionConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSqWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSqmTrEeSnqN8Csryy_Q" name="Single SemanticActionConfiguration" sections="_LxfSbWTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTQmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSq2TrEeSnqN8Csryy_Q" name="isSingleSemanticActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSrGTrEeSnqN8Csryy_Q" name="className" value="SemanticActionConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSrWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSrmTrEeSnqN8Csryy_Q" name="Single SemanticTypeConfiguration" sections="_LxfSbmTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTQ2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSr2TrEeSnqN8Csryy_Q" name="isSingleSemanticTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSsGTrEeSnqN8Csryy_Q" name="className" value="SemanticTypeConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSsWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSsmTrEeSnqN8Csryy_Q" name="Single ViewTypeConfiguration" sections="_LxfSb2TrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTRGTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSs2TrEeSnqN8Csryy_Q" name="isSingleViewTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfStGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfStWTrEeSnqN8Csryy_Q" name="className" value="ViewTypeConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfStmTrEeSnqN8Csryy_Q" name="Single ElementTypeAdviceConfiguration" sections="_LxfScGTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTRmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSt2TrEeSnqN8Csryy_Q" name="isSingleElementTypeAdviceConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSuGTrEeSnqN8Csryy_Q" name="className" value="ElementTypeAdviceConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSuWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSumTrEeSnqN8Csryy_Q" name="Single AspectSemanticTypeConfiguration" sections="_LxfScWTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTR2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSu2TrEeSnqN8Csryy_Q" name="isSingleAspectSemanticTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSvGTrEeSnqN8Csryy_Q" name="className" value="AspectSemanticTypeConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSvWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSvmTrEeSnqN8Csryy_Q" name="Single AspectViewTypeConfiguration" sections="_LxfScmTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTSWTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSv2TrEeSnqN8Csryy_Q" name="isSingleAspectViewTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSwGTrEeSnqN8Csryy_Q" name="className" value="AspectViewTypeConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSwWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSwmTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple ExtendedElementTypeSet" sections="_LxfSc2TrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTL2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSw2TrEeSnqN8Csryy_Q" name="isMultipleExtendedElementTypeSet">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSxGTrEeSnqN8Csryy_Q" name="className" value="ExtendedElementTypeSet"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSxWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSxmTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple ElementTypeConfiguration" sections="_LxfSdGTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTMmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSx2TrEeSnqN8Csryy_Q" name="isMultipleElementTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSyGTrEeSnqN8Csryy_Q" name="className" value="ElementTypeConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSyWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSymTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple IconEntry" sections="_LxfSdWTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTN2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSy2TrEeSnqN8Csryy_Q" name="isMultipleIconEntry">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSzGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfSzWTrEeSnqN8Csryy_Q" name="className" value="IconEntry"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfSzmTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple ConfigurationElement" sections="_LxfSdmTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTOmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfSz2TrEeSnqN8Csryy_Q" name="isMultipleConfigurationElement">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS0GTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS0WTrEeSnqN8Csryy_Q" name="className" value="ConfigurationElement"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS0mTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple MatcherConfiguration" sections="_LxfSd2TrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTP2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS02TrEeSnqN8Csryy_Q" name="isMultipleMatcherConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS1GTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS1WTrEeSnqN8Csryy_Q" name="className" value="MatcherConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS1mTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple ActionConfiguration" sections="_LxfSeGTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTQGTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS12TrEeSnqN8Csryy_Q" name="isMultipleActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS2GTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS2WTrEeSnqN8Csryy_Q" name="className" value="ActionConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS2mTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple ViewActionConfiguration" sections="_LxfSeWTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTQWTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS22TrEeSnqN8Csryy_Q" name="isMultipleViewActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS3GTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS3WTrEeSnqN8Csryy_Q" name="className" value="ViewActionConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS3mTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple SemanticActionConfiguration" sections="_LxfSemTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTQmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS32TrEeSnqN8Csryy_Q" name="isMultipleSemanticActionConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS4GTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS4WTrEeSnqN8Csryy_Q" name="className" value="SemanticActionConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS4mTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple SemanticTypeConfiguration" sections="_LxfSe2TrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTQ2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS42TrEeSnqN8Csryy_Q" name="isMultipleSemanticTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS5GTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS5WTrEeSnqN8Csryy_Q" name="className" value="SemanticTypeConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS5mTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple ViewTypeConfiguration" sections="_LxfSfGTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTRGTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS52TrEeSnqN8Csryy_Q" name="isMultipleViewTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS6GTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS6WTrEeSnqN8Csryy_Q" name="className" value="ViewTypeConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS6mTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple ElementTypeAdviceConfiguration" sections="_LxfSfWTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTRmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS62TrEeSnqN8Csryy_Q" name="isMultipleElementTypeAdviceConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS7GTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS7WTrEeSnqN8Csryy_Q" name="className" value="ElementTypeAdviceConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS7mTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple AspectSemanticTypeConfiguration" sections="_LxfSfmTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTR2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS72TrEeSnqN8Csryy_Q" name="isMultipleAspectSemanticTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS8GTrEeSnqN8Csryy_Q" name="className" value="AspectSemanticTypeConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS8WTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS8mTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple AspectViewTypeConfiguration" sections="_LxfSf2TrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTSWTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS82TrEeSnqN8Csryy_Q" name="isMultipleAspectViewTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS9GTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS9WTrEeSnqN8Csryy_Q" name="className" value="AspectViewTypeConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS9mTrEeSnqN8Csryy_Q" name="Single InvariantSemanticTypeConfiguration" sections="_LxfShGTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTTGTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS92TrEeSnqN8Csryy_Q" name="isSingleInvariantSemanticTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS-GTrEeSnqN8Csryy_Q" name="className" value="InvariantSemanticTypeConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS-WTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS-mTrEeSnqN8Csryy_Q" name="Single InvariantRuleConfiguration" sections="_LxfShWTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTTmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS-2TrEeSnqN8Csryy_Q" name="isSingleInvariantRuleConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS_GTrEeSnqN8Csryy_Q" name="className" value="InvariantRuleConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfS_WTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfS_mTrEeSnqN8Csryy_Q" name="Single ComposedRuleConfiguration" sections="_LxfShmTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTT2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfS_2TrEeSnqN8Csryy_Q" name="isSingleComposedRuleConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTAGTrEeSnqN8Csryy_Q" name="className" value="ComposedRuleConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTAWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfTAmTrEeSnqN8Csryy_Q" name="Single AndRule" sections="_LxfSh2TrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTUWTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfTA2TrEeSnqN8Csryy_Q" name="isSingleAndRule">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTBGTrEeSnqN8Csryy_Q" name="className" value="AndRule"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTBWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfTBmTrEeSnqN8Csryy_Q" name="Single OrRule" sections="_LxfSiGTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTUmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfTB2TrEeSnqN8Csryy_Q" name="isSingleOrRule">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTCGTrEeSnqN8Csryy_Q" name="className" value="OrRule"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTCWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfTCmTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple InvariantSemanticTypeConfiguration" sections="_LxfSiWTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTTGTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfTC2TrEeSnqN8Csryy_Q" name="isMultipleInvariantSemanticTypeConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTDGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTDWTrEeSnqN8Csryy_Q" name="className" value="InvariantSemanticTypeConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfTDmTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple InvariantRuleConfiguration" sections="_LxfSimTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTTmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfTD2TrEeSnqN8Csryy_Q" name="isMultipleInvariantRuleConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTEGTrEeSnqN8Csryy_Q" name="className" value="InvariantRuleConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTEWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfTEmTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple ComposedRuleConfiguration" sections="_LxfSi2TrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTT2TrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfTE2TrEeSnqN8Csryy_Q" name="isMultipleComposedRuleConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTFGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTFWTrEeSnqN8Csryy_Q" name="className" value="ComposedRuleConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfTFmTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple AndRule" sections="_LxfSjGTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTUWTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfTF2TrEeSnqN8Csryy_Q" name="isMultipleAndRule">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTGGTrEeSnqN8Csryy_Q" name="className" value="AndRule"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTGWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfTGmTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple OrRule" sections="_LxfSjWTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTUmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfTG2TrEeSnqN8Csryy_Q" name="isMultipleOrRule">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTHGTrEeSnqN8Csryy_Q" name="className" value="OrRule"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTHWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfTHmTrEeSnqN8Csryy_Q" name="Single InvariantContainerConfiguration" sections="_LxfSgGTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTVGTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfTH2TrEeSnqN8Csryy_Q" name="isSingleInvariantContainerConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTIGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTIWTrEeSnqN8Csryy_Q" name="className" value="InvariantContainerConfiguration"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfTImTrEeSnqN8Csryy_Q" name="Single HierarchyPermission" sections="_LxfSgWTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTVmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfTI2TrEeSnqN8Csryy_Q" name="isSingleHierarchyPermission">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTJGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTJWTrEeSnqN8Csryy_Q" name="className" value="HierarchyPermission"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfTJmTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple InvariantContainerConfiguration" sections="_LxfSgmTrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTVGTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfTJ2TrEeSnqN8Csryy_Q" name="isMultipleInvariantContainerConfiguration">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTKGTrEeSnqN8Csryy_Q" name="className" value="InvariantContainerConfiguration"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTKWTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0"/>
-    </constraints>
-  </views>
-  <views xmi:id="_LxfTKmTrEeSnqN8Csryy_Q" elementMultiplicity="-1" name="Multiple HierarchyPermission" sections="_LxfSg2TrEeSnqN8Csryy_Q" automaticContext="true" datacontexts="_LxfTVmTrEeSnqN8Csryy_Q">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_LxfTK2TrEeSnqN8Csryy_Q" name="isMultipleHierarchyPermission">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTLGTrEeSnqN8Csryy_Q" name="nsUri" value="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_LxfTLWTrEeSnqN8Csryy_Q" name="className" value="HierarchyPermission"/>
-    </constraints>
-  </views>
-  <dataContexts xmi:id="_LxfTLmTrEeSnqN8Csryy_Q" name="extendedtypes" label="extendedtypes">
-    <elements xmi:id="_LxfTL2TrEeSnqN8Csryy_Q" name="ExtendedElementTypeSet" supertypes="_LxfTOmTrEeSnqN8Csryy_Q">
-      <properties xmi:id="_LxfTMGTrEeSnqN8Csryy_Q" name="elementType" type="Reference" multiplicity="-1"/>
-      <properties xmi:id="_LxfTMWTrEeSnqN8Csryy_Q" name="extensible" type="Boolean"/>
-    </elements>
-    <elements xmi:id="_LxfTMmTrEeSnqN8Csryy_Q" name="ElementTypeConfiguration" supertypes="_LxfTOmTrEeSnqN8Csryy_Q">
-      <properties xmi:id="_LxfTM2TrEeSnqN8Csryy_Q" name="hint"/>
-      <properties xmi:id="_LxfTNGTrEeSnqN8Csryy_Q" name="kindName"/>
-      <properties xmi:id="_LxfTNWTrEeSnqN8Csryy_Q" name="specializedTypesID" multiplicity="-1"/>
-      <properties xmi:id="_LxfTNmTrEeSnqN8Csryy_Q" name="matcherConfiguration" type="Reference"/>
-    </elements>
-    <elements xmi:id="_LxfTN2TrEeSnqN8Csryy_Q" name="IconEntry">
-      <properties xmi:id="_LxfTOGTrEeSnqN8Csryy_Q" name="iconPath"/>
-      <properties xmi:id="_LxfTOWTrEeSnqN8Csryy_Q" name="bundleId"/>
-    </elements>
-    <elements xmi:id="_LxfTOmTrEeSnqN8Csryy_Q" name="ConfigurationElement">
-      <properties xmi:id="_LxfTO2TrEeSnqN8Csryy_Q" name="name"/>
-      <properties xmi:id="_LxfTPGTrEeSnqN8Csryy_Q" name="description"/>
-      <properties xmi:id="_LxfTPWTrEeSnqN8Csryy_Q" name="identifier"/>
-      <properties xmi:id="_LxfTPmTrEeSnqN8Csryy_Q" name="iconEntry" type="Reference"/>
-    </elements>
-    <elements xmi:id="_LxfTP2TrEeSnqN8Csryy_Q" name="MatcherConfiguration"/>
-    <elements xmi:id="_LxfTQGTrEeSnqN8Csryy_Q" name="ActionConfiguration" supertypes="_LxfTOmTrEeSnqN8Csryy_Q"/>
-    <elements xmi:id="_LxfTQWTrEeSnqN8Csryy_Q" name="ViewActionConfiguration" supertypes="_LxfTQGTrEeSnqN8Csryy_Q"/>
-    <elements xmi:id="_LxfTQmTrEeSnqN8Csryy_Q" name="SemanticActionConfiguration" supertypes="_LxfTQGTrEeSnqN8Csryy_Q"/>
-    <elements xmi:id="_LxfTQ2TrEeSnqN8Csryy_Q" name="SemanticTypeConfiguration" supertypes="_LxfTMmTrEeSnqN8Csryy_Q"/>
-    <elements xmi:id="_LxfTRGTrEeSnqN8Csryy_Q" name="ViewTypeConfiguration" supertypes="_LxfTMmTrEeSnqN8Csryy_Q">
-      <properties xmi:id="_LxfTRWTrEeSnqN8Csryy_Q" name="specializedDiagramTypeID"/>
-    </elements>
-    <elements xmi:id="_LxfTRmTrEeSnqN8Csryy_Q" name="ElementTypeAdviceConfiguration" supertypes="_LxfTOmTrEeSnqN8Csryy_Q"/>
-    <elements xmi:id="_LxfTR2TrEeSnqN8Csryy_Q" name="AspectSemanticTypeConfiguration" supertypes="_LxfTQ2TrEeSnqN8Csryy_Q">
-      <properties xmi:id="_LxfTSGTrEeSnqN8Csryy_Q" name="actionConfiguration" type="Reference" multiplicity="-1"/>
-    </elements>
-    <elements xmi:id="_LxfTSWTrEeSnqN8Csryy_Q" name="AspectViewTypeConfiguration" supertypes="_LxfTRGTrEeSnqN8Csryy_Q">
-      <properties xmi:id="_LxfTSmTrEeSnqN8Csryy_Q" name="actionConfiguration" type="Reference" multiplicity="-1"/>
-    </elements>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
-  </dataContexts>
-  <dataContexts xmi:id="_LxfTS2TrEeSnqN8Csryy_Q" name="invariantsemantictypeconfiguration" label="invariantsemantictypeconfiguration">
-    <elements xmi:id="_LxfTTGTrEeSnqN8Csryy_Q" name="InvariantSemanticTypeConfiguration" supertypes="_LxfTQ2TrEeSnqN8Csryy_Q">
-      <properties xmi:id="_LxfTTWTrEeSnqN8Csryy_Q" name="invariantRuleConfiguration" type="Reference"/>
-    </elements>
-    <elements xmi:id="_LxfTTmTrEeSnqN8Csryy_Q" name="InvariantRuleConfiguration"/>
-    <elements xmi:id="_LxfTT2TrEeSnqN8Csryy_Q" name="ComposedRuleConfiguration" supertypes="_LxfTTmTrEeSnqN8Csryy_Q">
-      <properties xmi:id="_LxfTUGTrEeSnqN8Csryy_Q" name="composedRules" type="Reference" multiplicity="-1"/>
-    </elements>
-    <elements xmi:id="_LxfTUWTrEeSnqN8Csryy_Q" name="AndRule" supertypes="_LxfTT2TrEeSnqN8Csryy_Q"/>
-    <elements xmi:id="_LxfTUmTrEeSnqN8Csryy_Q" name="OrRule" supertypes="_LxfTT2TrEeSnqN8Csryy_Q"/>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
-  </dataContexts>
-  <dataContexts xmi:id="_LxfTU2TrEeSnqN8Csryy_Q" name="invariantcontainerconfiguration" label="invariantcontainerconfiguration">
-    <elements xmi:id="_LxfTVGTrEeSnqN8Csryy_Q" name="InvariantContainerConfiguration" supertypes="_LxfTTmTrEeSnqN8Csryy_Q">
-      <properties xmi:id="_LxfTVWTrEeSnqN8Csryy_Q" name="permissions" type="Reference" multiplicity="-1"/>
-    </elements>
-    <elements xmi:id="_LxfTVmTrEeSnqN8Csryy_Q" name="HierarchyPermission">
-      <properties xmi:id="_LxfTV2TrEeSnqN8Csryy_Q" name="childType"/>
-      <properties xmi:id="_LxfTWGTrEeSnqN8Csryy_Q" name="isPermitted" type="Boolean"/>
-      <properties xmi:id="_LxfTWWTrEeSnqN8Csryy_Q" name="isStrict" type="Boolean"/>
-    </elements>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@modelElementFactories.0"/>
-  </dataContexts>
-</contexts:Context>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleActionConfiguration.xwt
deleted file mode 100644
index 0bf55bd8ccd..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleActionConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleAndRule.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleAndRule.xwt
deleted file mode 100644
index 2d251a2192c..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleAndRule.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleAspectSemanticTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleAspectSemanticTypeConfiguration.xwt
deleted file mode 100644
index 4d360228f8d..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleAspectSemanticTypeConfiguration.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleAspectViewTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleAspectViewTypeConfiguration.xwt
deleted file mode 100644
index 0073f7b1b90..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleAspectViewTypeConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleComposedRuleConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleComposedRuleConfiguration.xwt
deleted file mode 100644
index 8ee6141e132..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleComposedRuleConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleConfigurationElement.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleConfigurationElement.xwt
deleted file mode 100644
index 8ee6141e132..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleConfigurationElement.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleElementTypeAdviceConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleElementTypeAdviceConfiguration.xwt
deleted file mode 100644
index 8ee6141e132..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleElementTypeAdviceConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleElementTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleElementTypeConfiguration.xwt
deleted file mode 100644
index 68755b0d02e..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleElementTypeConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleExtendedElementTypeSet.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleExtendedElementTypeSet.xwt
deleted file mode 100644
index 826244688cc..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleExtendedElementTypeSet.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleHierarchyPermission.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleHierarchyPermission.xwt
deleted file mode 100644
index 666333b882c..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleHierarchyPermission.xwt
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="invariantcontainerconfiguration:HierarchyPermission:isPermitted"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="invariantcontainerconfiguration:HierarchyPermission:isStrict"></ppe:BooleanRadio>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleIconEntry.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleIconEntry.xwt
deleted file mode 100644
index 06715782ba9..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleIconEntry.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleInvariantContainerConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleInvariantContainerConfiguration.xwt
deleted file mode 100644
index 71e2f0b09bf..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleInvariantContainerConfiguration.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleInvariantRuleConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleInvariantRuleConfiguration.xwt
deleted file mode 100644
index 68755b0d02e..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleInvariantRuleConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleInvariantSemanticTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleInvariantSemanticTypeConfiguration.xwt
deleted file mode 100644
index e29bdbb8542..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleInvariantSemanticTypeConfiguration.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleMatcherConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleMatcherConfiguration.xwt
deleted file mode 100644
index e29bdbb8542..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleMatcherConfiguration.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleOrRule.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleOrRule.xwt
deleted file mode 100644
index 2d251a2192c..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleOrRule.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleSemanticActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleSemanticActionConfiguration.xwt
deleted file mode 100644
index 58a47121f26..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleSemanticActionConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleSemanticTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleSemanticTypeConfiguration.xwt
deleted file mode 100644
index 8b69f2a1492..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleSemanticTypeConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleViewActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleViewActionConfiguration.xwt
deleted file mode 100644
index 78049e574ae..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleViewActionConfiguration.xwt
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleViewTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleViewTypeConfiguration.xwt
deleted file mode 100644
index 3b396a9929b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/MultipleViewTypeConfiguration.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleActionConfiguration.xwt
deleted file mode 100644
index ed935b702b0..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleActionConfiguration.xwt
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleAndRule.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleAndRule.xwt
deleted file mode 100644
index 3abd72e2b44..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleAndRule.xwt
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="invariantsemantictypeconfiguration:ComposedRuleConfiguration:composedRules"></ppe:MultiReference>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleAspectSemanticTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleAspectSemanticTypeConfiguration.xwt
deleted file mode 100644
index 3c804bb331d..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleAspectSemanticTypeConfiguration.xwt
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:hint"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:kindName"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:matcherConfiguration"></ppe:ReferenceDialog>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiString input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:specializedTypesID"></ppe:MultiString>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="extendedtypes:AspectSemanticTypeConfiguration:actionConfiguration"></ppe:MultiReference>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleAspectViewTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleAspectViewTypeConfiguration.xwt
deleted file mode 100644
index bfd741d2505..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleAspectViewTypeConfiguration.xwt
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:hint"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:kindName"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ViewTypeConfiguration:specializedDiagramTypeID"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:matcherConfiguration"></ppe:ReferenceDialog>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiString input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:specializedTypesID"></ppe:MultiString>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="extendedtypes:AspectViewTypeConfiguration:actionConfiguration"></ppe:MultiReference>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleComposedRuleConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleComposedRuleConfiguration.xwt
deleted file mode 100644
index b6e4be3921c..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleComposedRuleConfiguration.xwt
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="invariantsemantictypeconfiguration:ComposedRuleConfiguration:composedRules"></ppe:MultiReference>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleConfigurationElement.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleConfigurationElement.xwt
deleted file mode 100644
index 6dc1338b69a..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleConfigurationElement.xwt
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleElementTypeAdviceConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleElementTypeAdviceConfiguration.xwt
deleted file mode 100644
index 3f1cbbd0e09..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleElementTypeAdviceConfiguration.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleElementTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleElementTypeConfiguration.xwt
deleted file mode 100644
index 949a55cb329..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleElementTypeConfiguration.xwt
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:hint"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:kindName"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:matcherConfiguration"></ppe:ReferenceDialog>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiString input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:specializedTypesID"></ppe:MultiString>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleExtendedElementTypeSet.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleExtendedElementTypeSet.xwt
deleted file mode 100644
index d28da7e1431..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleExtendedElementTypeSet.xwt
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="extendedtypes:ExtendedElementTypeSet:extensible"></ppe:BooleanRadio>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="extendedtypes:ExtendedElementTypeSet:elementType"></ppe:MultiReference>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleHierarchyPermission.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleHierarchyPermission.xwt
deleted file mode 100644
index 633cd6c4114..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleHierarchyPermission.xwt
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="invariantcontainerconfiguration:HierarchyPermission:childType"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:BooleanRadio input="{Binding}"
-			property="invariantcontainerconfiguration:HierarchyPermission:isPermitted"></ppe:BooleanRadio>
-		<ppe:BooleanRadio input="{Binding}"
-			property="invariantcontainerconfiguration:HierarchyPermission:isStrict"></ppe:BooleanRadio>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleIconEntry.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleIconEntry.xwt
deleted file mode 100644
index de034edffbb..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleIconEntry.xwt
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:IconEntry:iconPath"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:IconEntry:bundleId"></ppe:StringEditor>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleInvariantContainerConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleInvariantContainerConfiguration.xwt
deleted file mode 100644
index 06e962f6466..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleInvariantContainerConfiguration.xwt
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="invariantcontainerconfiguration:InvariantContainerConfiguration:permissions"></ppe:MultiReference>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleInvariantRuleConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleInvariantRuleConfiguration.xwt
deleted file mode 100644
index 826244688cc..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleInvariantRuleConfiguration.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:x="http://www.eclipse.org/xwt">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleInvariantSemanticTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleInvariantSemanticTypeConfiguration.xwt
deleted file mode 100644
index e350b621656..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleInvariantSemanticTypeConfiguration.xwt
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:hint"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:kindName"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:matcherConfiguration"></ppe:ReferenceDialog>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="invariantsemantictypeconfiguration:InvariantSemanticTypeConfiguration:invariantRuleConfiguration"></ppe:ReferenceDialog>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiString input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:specializedTypesID"></ppe:MultiString>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleMatcherConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleMatcherConfiguration.xwt
deleted file mode 100644
index 71e2f0b09bf..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleMatcherConfiguration.xwt
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleOrRule.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleOrRule.xwt
deleted file mode 100644
index d5c0d95162e..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleOrRule.xwt
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference input="{Binding}"
-			property="invariantsemantictypeconfiguration:ComposedRuleConfiguration:composedRules"></ppe:MultiReference>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleSemanticActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleSemanticActionConfiguration.xwt
deleted file mode 100644
index 0a3d265e06d..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleSemanticActionConfiguration.xwt
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleSemanticTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleSemanticTypeConfiguration.xwt
deleted file mode 100644
index a1b049890c5..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleSemanticTypeConfiguration.xwt
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:hint"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:kindName"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:matcherConfiguration"></ppe:ReferenceDialog>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiString input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:specializedTypesID"></ppe:MultiString>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleViewActionConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleViewActionConfiguration.xwt
deleted file mode 100644
index a8c5673df37..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleViewActionConfiguration.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns:x="http://www.eclipse.org/xwt"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
-	xmlns="http://www.eclipse.org/xwt/presentation">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleViewTypeConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleViewTypeConfiguration.xwt
deleted file mode 100644
index 20578bb6b63..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/propertyView/ExtendedTypes/ui/SingleViewTypeConfiguration.xwt
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
-	xmlns="http://www.eclipse.org/xwt/presentation"
-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:hint"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:kindName"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:name"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:description"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ConfigurationElement:identifier"></ppe:StringEditor>
-		<ppe:StringEditor input="{Binding}"
-			property="extendedtypes:ViewTypeConfiguration:specializedDiagramTypeID"></ppe:StringEditor>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:matcherConfiguration"></ppe:ReferenceDialog>
-		<ppe:ReferenceDialog input="{Binding}"
-			property="extendedtypes:ConfigurationElement:iconEntry"></ppe:ReferenceDialog>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiString input="{Binding}"
-			property="extendedtypes:ElementTypeConfiguration:specializedTypesID"></ppe:MultiString>
-	</Composite>
-</Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/src/org/eclipse/papyrus/customization/extendedtypes/Activator.java b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/src/org/eclipse/papyrus/customization/extendedtypes/Activator.java
deleted file mode 100644
index c25646c9c91..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/src/org/eclipse/papyrus/customization/extendedtypes/Activator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2014 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.customization.extendedtypes;

-

-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.customization.extendedtypes"; //$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)

-	 */

-	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)

-	 */

-	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/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
index a42766b2eeb..517df1168d7 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
@@ -2,7 +2,6 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.customization.paletteconfiguration,
  org.eclipse.papyrus.customization.paletteconfiguration.queries
 Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend
index 63b4d9e479b..5cbb6d18b97 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xtend
@@ -129,11 +129,6 @@ override def addDestroyShortcutsCommand(GenDiagram it) '''
 		
 		«getCreateCommand(it)»
 		
-		// RS: add code for extended types
-		«getCreateExtendedTypeCommand(it)»
-		«getExtendedStartCreateRelationshipCommand(it)»
-		«getExtendedCompleteCreateRelationshipCommand(it)»
-		// RS: End of add code for extended types
 		«getCreateSemanticServiceEditCommand(it)»
 		
 		«getSetCommand(it)»
@@ -206,44 +201,6 @@ protected org.eclipse.gef.commands.Command getCreateRelationshipCommand(org.ecli
 	}
 '''

 

-	def getCreateExtendedTypeCommand(GenDiagram it) '''
-«generatedMemberComment»
- protected org.eclipse.gef.commands.Command getExtendedTypeCreationCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest request, org.eclipse.gmf.runtime.emf.type.core.IElementType requestElementType) {
-		org.eclipse.papyrus.infra.services.edit.service.IElementEditService provider = org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if(provider == null) {
-			return org.eclipse.gef.commands.UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		org.eclipse.gmf.runtime.common.core.command.ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-'''

-

-	def getExtendedStartCreateRelationshipCommand(GenDiagram it) '''
-«generatedMemberComment»
- protected org.eclipse.gef.commands.Command getExtendedStartCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest request, org.eclipse.gmf.runtime.emf.type.core.IElementType requestElementType) {
-	org.eclipse.papyrus.infra.services.edit.service.IElementEditService provider = org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils.getCommandProvider(requestElementType);
-	if(provider == null) {
-		return org.eclipse.gef.commands.UnexecutableCommand.INSTANCE;
-	}
-	// Retrieve create command from the Element Edit service
-	org.eclipse.gmf.runtime.common.core.command.ICommand createGMFCommand = provider.getEditCommand(request);
-	return getGEFWrapper(createGMFCommand);
-}
-'''

-

-	def getExtendedCompleteCreateRelationshipCommand(GenDiagram it) '''
-«generatedMemberComment»
- protected org.eclipse.gef.commands.Command getExtendedCompleteCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest request, org.eclipse.gmf.runtime.emf.type.core.IElementType requestElementType) {
-	org.eclipse.papyrus.infra.services.edit.service.IElementEditService provider = org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils.getCommandProvider(requestElementType);
-	if(provider == null) {
-		return org.eclipse.gef.commands.UnexecutableCommand.INSTANCE;
-	}
-	// Retrieve create command from the Element Edit service
-	org.eclipse.gmf.runtime.common.core.command.ICommand createGMFCommand = provider.getEditCommand(request);
-	return getGEFWrapper(createGMFCommand);
-}
-'''

 

 	override getMoveCommand(GenDiagram it) '''
 «generatedMemberComment()»
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/linkCommands.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/linkCommands.xtend
index f4895b3a4d6..7141f4fb939 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/linkCommands.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/linkCommands.xtend
@@ -78,9 +78,6 @@ import xpt.providers.ElementTypes
 				return null;
 			}
 			org.eclipse.gmf.runtime.emf.type.core.IElementType baseElementType = requestElementType;
-			«IF aspectsUtils_qvto.containsCreateStartLinkCommand(it)»
-			boolean isExtendedType = true;
-			«ENDIF»
 			
 			«FOR l : getAllPotentialLinks(it)»
 			«startLinkCommands(l, it)»
@@ -96,9 +93,6 @@ import xpt.providers.ElementTypes
 				return null;
 			}
 			org.eclipse.gmf.runtime.emf.type.core.IElementType baseElementType = requestElementType;
-			«IF aspectsUtils_qvto.containsCreateCompleteLinkCommand(it)»
-			boolean isExtendedType = true;
-			«ENDIF»
 
 			«FOR l : getAllPotentialLinks(it)»
 			«completeLinkCommands(l, it)»
@@ -110,9 +104,7 @@ import xpt.providers.ElementTypes
 		override startLinkCommands(GenLink it, GenLinkEnd linkEnd) '''
 		if («xptElementTypes.accessElementType(it)» == baseElementType) {
 		«IF createStartLinkCommand(it, linkEnd)»
-		if(isExtendedType) {
-			return getExtendedStartCreateRelationshipCommand(req, requestElementType);
-		}
+
 				return getGEFWrapper(new «xptCreateLinkCommand.qualifiedClassName(it)»(req,
 					«IF createStartIncomingLinkCommand(it, linkEnd)»
 						req.getTarget(), req.getSource()
@@ -123,15 +115,12 @@ import xpt.providers.ElementTypes
 			«ELSE»
 				return null;
 			«ENDIF»
-		}
 	'''
 	
 		override completeLinkCommands(GenLink it, GenLinkEnd linkEnd) '''
 		if («xptElementTypes.accessElementType(it)» == baseElementType) {
 			«IF createCompleteLinkCommand(it, linkEnd)»
-			if(isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);
-			}
+
 				return getGEFWrapper(new «xptCreateLinkCommand.qualifiedClassName(it)»(req,
 					«IF createCompleteOutgoingLinkCommand(it, linkEnd)»
 						req.getTarget(), req.getSource()
@@ -142,7 +131,6 @@ import xpt.providers.ElementTypes
 			«ELSE»
 				return null;
 			«ENDIF»
-		}
 	'''
 	
 

diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend
index 323c3939a94..401cdcf7303 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend
@@ -197,21 +197,11 @@ import xpt.editor.VisualIDRegistry
 			«generatedMemberComment»«/* XXX: unlike createNode, we don't check op.containerView() for null here. On purpose? */»
 	protected boolean provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation op) {
 		org.eclipse.gmf.runtime.emf.type.core.IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if(elementType instanceof org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType) {
-			org.eclipse.gmf.runtime.emf.type.core.IElementType closestNonExtendedType = org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils.getClosestDiagramType(elementType);
-			if(!«getElementTypesQualifiedClassName()».isKnownElementType(closestNonExtendedType) || (!(closestNonExtendedType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!«getElementTypesQualifiedClassName()».isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-				return false; // foreign element type
-			}
+		
+		if (!«getElementTypesQualifiedClassName()».isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
+			return false; // foreign element type
 		}
-		//if (!«getElementTypesQualifiedClassName()».isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
+		
 		String elementTypeHint = ((org.eclipse.gmf.runtime.emf.type.core.IHintedType) elementType).getSemanticHint();
 		if (elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
 			return false; // our hint is visual id and must be specified, and it should be the same as in element type
diff --git a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/target/generated-eclipse-help/DeveloperDoc.html b/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/target/generated-eclipse-help/DeveloperDoc.html
deleted file mode 100644
index b59c61f461b..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.diagram.common.doc/target/generated-eclipse-help/DeveloperDoc.html
+++ /dev/null
@@ -1,264 +0,0 @@
-<html>

-<link rel="stylesheet" href="default.css" type="text/css">

-<H1>Document about stereotype application display</H1>

-<H2 id ="_hl1YYPy2EeWMIr2UMud8Pw">Table of Contents</H2>

-<H2 id ="_hl7fAPy2EeWMIr2UMud8Pw">Requirements</H2>

-<p>- Stereotype application properties dipslay (id=REQ_001): <BR/> Stereotype application properties could be displayed as "comment" inside a compartment, or as brace label</p>

-<p>- Display Requirement as a "comment" (id=REQ_0011): <BR/> When the applied stereotype properties are displayed as a comment, a shape " comment " is created with a dashed line form the comment to the representation of the stereotyped element. The comment contains a label with the name of the stereotype, and contains as a stack list of all wanted properties of the wanted applied stereotype .</p>

-<p>- Display Requirement as a "compartment" (id=REQ_0012): <BR/> When the applied stereotype properties are displayed as a compartment, a compartment is created inside the representation of the stereotyped element, under the label of the name. The comment contains a label with the name of the stereotype, and contaisn as a stack list of all wanted properties of the applied stereotype.
<BR/>This representation can be done only on nodes.</p>

-<p>- Display Requirement as a "brace" (id=REQ_0013): <BR/> When the applied stereotype properties are displayed as brace, all this data is displayed in a label under the name label.
<BR/>This representation can be done only on nodes.</p>

-<p>- Display stereotype name (id=REQ_002): <BR/> The shape can display the name of the stereotypes that are applied on the UML element</p>

-<p>- Apply a stereotype (id=REQ_0021): <BR/> When the stereotype is applied, the shape displays automatically the name of the sterotypes in the label of stereotype</p>

-<p>- Drop from  the model explorer (id=REQ_0022): <BR/> When an element is dropped form the model explorer to the diagram, the shape of the element must display the name of the applied stereotype in the label of stereotype</p>

-<p>- Display the name of the stereotype  (id=REQ_0023): <BR/> Each applied stereotype can be either displayed with a short name or with the Qualified Name in the label of stereotype</p>

-<p>- Display each applied stereotype name differently (id=REQ_0024): <BR/> The displayed qualified name depth can be defined for each stereotype.</p>

-<p>- Qualified name depth (id=REQ_003): <BR/> The user must be able to choose the depth of the QN to be displayed</p>

-<p>- Choice on Stereotype properties to display (id=REQ_004): <BR/> The user can choose the applied stereotype properties to display </p>

-<p>- Use CSS file (id=REQ_0041): <BR/> The user can choose the applied stereotype properties to display by using a css file.</p>

-<p>- Use property view (id=REQ_0042): <BR/> The user can choose the applied stereotype properties to display by using the property view</p>

-<p>- Remove display of applied stereotype  (id=REQ_005): <BR/> A display of applied stereotype or display of applied stereotype properties can be removed when a stereotype or a profile is unapplied </p>

-<p>- Update display (id=REQ_006): <BR/> Update the display of applied stereotype properties when the affected values have changed</p>

-<H2 id ="_hmrF4fy2EeWMIr2UMud8Pw">Use Cases</H2>

-<P align="middle"><img src=./imgDOC/UseCases.png alt=UseCases ></P><P align="middle">UseCases</P></BR>

-<H3 id ="_huYQYPy2EeWMIr2UMud8Pw">Papyrus stereotype display</H3>

-<H4 id ="_huaFkfy2EeWMIr2UMud8Pw">Display applied stereotype name</H4>

-<p>  - traces to <a href="#_hmSEUPy2EeWMIr2UMud8Pw" title="Requirement Apply a stereotype">Apply a stereotype</a>, <a href="#_hmUgkPy2EeWMIr2UMud8Pw" title="Requirement Drop from  the model explorer">Drop from  the model explorer</a>, <a href="#_hmW80fy2EeWMIr2UMud8Pw" title="Requirement Display the name of the stereotype ">Display the name of the stereotype </a>, <a href="#_hmaAIPy2EeWMIr2UMud8Pw" title="Requirement Display each applied stereotype name differently">Display each applied stereotype name differently</a>, <a href="#_hmPBAfy2EeWMIr2UMud8Pw" title="Requirement Display stereotype name">Display stereotype name</a></p>

-<p>The diagram contains a shape. When you applied a stereotype on the element, the applied stereotype name is displayed on the shape below the name of the element.
<BR/>When an element is dropped form the model explorer to the diagram, the applied stereotype named is displayed on the shape.
<BR/>This is the same behavior for links. </p>

-<H5 id ="_hxqN4Py2EeWMIr2UMud8Pw">How to</H5>

-<p>Inside  papyrus, it is possible to display the name of applied stereotype. 
<BR/>To do that:
<BR/>1. Apply the profile  that contains the stereotype on your model.
<BR/>2. Apply the wanted stereotype on the element.</p>

-<P align="middle"><img src=./imgDOC/ApplyProfile.png alt=Apply a profile ></P><P align="middle">Apply a profile</P></BR>

-<P align="middle"><img src=./imgDOC/applyStereotype.png alt=Apply the stereotype ></P><P align="middle">Apply the stereotype</P></BR>

-<P align="middle"><img src=./imgDOC/AppliedStereotype.png alt=Resulted applied stereotype ></P><P align="middle">Resulted applied stereotype</P></BR>

-<H4 id ="_hx6skfy2EeWMIr2UMud8Pw">Display stereotype properties</H4>

-<p>  - traces to <a href="#_hl_wcPy2EeWMIr2UMud8Pw" title="Requirement Stereotype application properties dipslay">Stereotype application properties dipslay</a></p>

-<p>It is possible to display properties of stereotypes as "comment", as "compartment", as "brace"</p>

-<H4 id ="_hyCoYfy2EeWMIr2UMud8Pw">As "brace"</H4>

-<p>  - traces to <a href="#_hmL9sPy2EeWMIr2UMud8Pw" title="Requirement Display Requirement as a "brace"">Display Requirement as a "brace"</a></p>

-<p>Properties of applied stereotype can be displayed as "brace". This is label that is set below the name, and contains a sequence of properties name with their values.</p>

-<H5 id ="_hyKkMPy2EeWMIr2UMud8Pw">How to</H5>

-<p>To do that:
<BR/>1. Select your Element.
<BR/>2. Select the Appearance Tab in the property view
<BR/>3. Select "In braces" for the line of your applied stereotype</p>

-<P align="middle"><img src=./imgDOC/DisplayInBrace.png alt=Sequence of actions to display in brace ></P><P align="middle">Sequence of actions to display in brace</P></BR>

-<P align="middle"><img src=./imgDOC/ResultDisplayInBrace.png alt=Properties of stereotypes displayed in brace ></P><P align="middle">Properties of stereotypes displayed in brace</P></BR>

-<H4 id ="_hyUVMfy2EeWMIr2UMud8Pw">As "compartment"</H4>

-<p>  - traces to <a href="#_hmITUPy2EeWMIr2UMud8Pw" title="Requirement Display Requirement as a "compartment"">Display Requirement as a "compartment"</a></p>

-<p>Properties of applied stereotype can be displayed as a compartment. This compartment contains all labels that are properties of the applied stereotype.</p>

-<H5 id ="_hycRAPy2EeWMIr2UMud8Pw">How to</H5>

-<p>To do that:
<BR/>1. Select your Element
<BR/>2. Select the Appearance Tab in the property view
<BR/>3. Select "In Compartment" for the line of your applied stereotype</p>

-<P align="middle"><img src=./imgDOC/DisplayInCompartment.png alt=Sequence of actions to display in compartment ></P><P align="middle">Sequence of actions to display in compartment</P></BR>

-<P align="middle"><img src=./imgDOC/ResultDisplayInCompartment.png alt=Properties of stereotypes displayed in compartment ></P><P align="middle">Properties of stereotypes displayed in compartment</P></BR>

-<H4 id ="_hypFUPy2EeWMIr2UMud8Pw">As "Comment"</H4>

-<p>  - traces to <a href="#_hmEB4Py2EeWMIr2UMud8Pw" title="Requirement Display Requirement as a "comment"">Display Requirement as a "comment"</a></p>

-<p>Properties of applied stereotype can be displayed as a comment. This comment representation that contains all labels that are properties of the applied stereotype.</p>

-<p>To do that:
<BR/>1. Select your Element
<BR/>2. Select the Appearance Tab in the property view
<BR/>3. Select "In Comment" for the line of your applied stereotype</p>

-<P align="middle"><img src=./imgDOC/DisplayInComment.png alt=Sequence of actions to display in comment ></P><P align="middle">Sequence of actions to display in comment</P></BR>

-<P align="middle"><img src=./imgDOC/ResultDisplayInComment.png alt=Properties of stereotype displayed in comment ></P><P align="middle">Properties of stereotype displayed in comment</P></BR>

-<H4 id ="_hzARsfy2EeWMIr2UMud8Pw">Choose properties to display</H4>

-<p>  - traces to <a href="#_hmh78Py2EeWMIr2UMud8Pw" title="Requirement Use CSS file">Use CSS file</a>, <a href="#_hmjxIfy2EeWMIr2UMud8Pw" title="Requirement Use property view">Use property view</a>, <a href="#_hmffsPy2EeWMIr2UMud8Pw" title="Requirement Choice on Stereotype properties to display">Choice on Stereotype properties to display</a></p>

-<p>The list of properties of stereotypes can be chosen by the user by using the property view or by writing a css.
<BR/>This choice runs for the 3 representations of applied stereotypes: brace, compartment, comment.</p>

-<H5 id ="_hzKpwfy2EeWMIr2UMud8Pw">How to</H5>

-<p>By using the property view, it is possible to select the list of property of stereotype.
<BR/>To do that:
<BR/>1. Select your element.
<BR/>2. Check that the applied stereotype has been displayed as brace, compartment or comment
<BR/>3. Select lines that correspond to wanted properties of stereotype.</p>

-<P align="middle"><img src=./imgDOC/ChooseProperties_PV.png alt=Select properties by using the property view ></P><P align="middle">Select properties by using the property view</P></BR>

-<p>By using CSS file:
<BR/>Compartment[type=StereotypeCompartment]{
<BR/>	visible:true;
<BR/>}
<BR/>Compartment[type=StereotypeCompartment]>[property="derived"]{
<BR/>	visible:false;
<BR/>}
<BR/>Compartment[type=StereotypeCompartment]>[property="derivedFrom"]{
<BR/>	visible:false;
<BR/>}
<BR/>The compartment is displayed and the property derived and derivedFrom are not displayed
<BR/>
<BR/>
<BR/></p>

-<P align="middle"><img src=./imgDOC/ChooseProperties_CSS.png alt=Result by using the selection by CSS ></P><P align="middle">Result by using the selection by CSS</P></BR>

-<p>The following CSS rules are implemented by default for all the Diagrams:
<BR/>Shape[type=StereotypeComment]{
<BR/>	visible:false;
<BR/>}
<BR/>
<BR/>StereotypeComment Compartment[type=StereotypeBrace]{
<BR/>	visible:false;
<BR/>}
<BR/>
<BR/>Compartment[type=StereotypeCompartment]{
<BR/>	visible:false;
<BR/>}
<BR/>
<BR/>Compartment[type=StereotypeBrace]{
<BR/>	visible:false;
<BR/>}
<BR/>
<BR/>Label[type=StereotypeLabel]{
<BR/>	depth:"none";
<BR/>}
<BR/>
<BR/>
<BR/>
<BR/>
<BR/>Here is some example of CSS to display the Stereotype:
<BR/>/* To modify the depth */
<BR/>Label[type=StereotypeLabel]{
<BR/>	depth:"-1";
<BR/>}
<BR/>
<BR/>/* To make the properties visible into compartment */
<BR/>Compartment[type=StereotypeCompartment]{
<BR/>	visible:true;
<BR/>}
<BR/>
<BR/>/* Hide the property "allocatedTo" into the compartment */
<BR/>Compartment[type=StereotypeCompartment]>[property="allocatedTo"]{
<BR/>	visible:false;
<BR/>}
<BR/>
<BR/>/* Hide all the properties into the Compartment of the stereotype Block */
<BR/>Compartment[stereotype="SysML::Blocks::Block"]{
<BR/>	visible:false;
<BR/>}
<BR/>
<BR/>/* Display the Comment shape */
<BR/>StereotypeComment{
<BR/>	visible:true;
<BR/>}
<BR/>
<BR/>/* Display the properties in Brace into the Comment*/
<BR/>StereotypeComment Compartment[type=StereotypeBrace]{
<BR/>	visible:true;
<BR/>}
<BR/>
<BR/></p>

-<H4 id ="_hzh2IPy2EeWMIr2UMud8Pw">Choose QN depth</H4>

-<p>  - traces to <a href="#_hmdDcPy2EeWMIr2UMud8Pw" title="Requirement Qualified name depth">Qualified name depth</a></p>

-<p>The stereotype name can be displayed by choosing the depth. I consists on choosing the size of the qualified name of the stereotype.
<BR/>full = all the qualified name
<BR/>0= only the name of stereotype
<BR/>-1= the name of its parent + the name of the stereotype
<BR/>-2=the name of its great-parent+ the name of its parent + the name of the stereotype</p>

-<p>Using Css: 
<BR/>Label[type=StereotypeLabel]{
<BR/>	depth:"-1";
<BR/>}
<BR/> By using the property view:
<BR/>1. Select the element.
<BR/>2. Select the appearance Tab
<BR/>3. Select the name depth and choose the size</p>

-<P align="middle"><img src=./imgDOC/depth.png alt=Select the depth the applied stereotype name ></P><P align="middle">Select the depth the applied stereotype name</P></BR>

-<H4 id ="_hzvRgPy2EeWMIr2UMud8Pw">Remove display of stereotype properties</H4>

-<p>  - traces to <a href="#_hmmNYfy2EeWMIr2UMud8Pw" title="Requirement Remove display of applied stereotype ">Remove display of applied stereotype </a></p>

-<p>The display of stereotype can be removed by selection or by unapply stereotype or profile container</p>

-<H4 id ="_hz2mQfy2EeWMIr2UMud8Pw">Update the display of applied stereotype properties</H4>

-<p>  - traces to <a href="#_hmopofy2EeWMIr2UMud8Pw" title="Requirement Update display">Update display</a></p>

-<p>When the value associated to the property of stereotype has been modified, the display must be modified.</p>

-<p>It is possible to edit value of stereotype property by double click on the property in the diagram.
<BR/>Important: the property must be writable and Real are not yet editable. </p>

-<P align="middle"><img src=./imgDOC/PropertyEdition.png alt=Property of applied stereotype edition ></P><P align="middle">Property of applied stereotype edition</P></BR>

-<H5 id ="_h0EBofy2EeWMIr2UMud8Pw">How to</H5>

-<p>It is possible to edit property of applied stereotype by using the property view:
<BR/>1. Select your element
<BR/>2. Select the Profile tab
<BR/>3. Expand the stereotype
<BR/>4. Select the property
<BR/>5. Edit at right the property of the stereotype</p>

-<P align="middle"><img src=./imgDOC/PropertyEdition_PV.png alt=Property edition for applied stereotypes in the property view ></P><P align="middle">Property edition for applied stereotypes in the property view</P></BR>

-<H2 id ="_h0NLkPy2EeWMIr2UMud8Pw">Design</H2>

-<H3 id ="_h0Q18Py2EeWMIr2UMud8Pw">Package org.eclipse.papyrus.uml.diagram.stereotype.edition</H3>

-<H4 id ="_h0T5QPy2EeWMIr2UMud8Pw">Class Activator</H4>

-<p>  - specializes <a href="#_IufLAvZ5EeWfXdmtYb4ggQ" title="Class AbstractUIPlugin">AbstractUIPlugin</a></p>

-<p>
<BR/> * The activator class controls the plug-in life cycle
<BR/> </p>

-<H4 id ="_h0dDMfy2EeWMIr2UMud8Pw">Package editpart</H4>

-<H5 id ="_h0gtkfy2EeWMIr2UMud8Pw">Class AppliedStereotypeCommentEditPart</H5>

-<p>  - specializes <a href="#_IvnMYvZ5EeWfXdmtYb4ggQ" title="Class NodeEditPart">NodeEditPart</a><BR/><BR/>  - realizes <a href="#_IvpBkvZ5EeWfXdmtYb4ggQ" title="Interface IGraphicalEditPart">IGraphicalEditPart</a>, <a href="#_IvvvQPZ5EeWfXdmtYb4ggQ" title="Interface IPrimaryEditPart">IPrimaryEditPart</a></p>

-<p>
<BR/> * The Applied StereotypeCommentEdipart and the appliedStereotypeCommentLinkEditPart are connected to the semantic element.
<BR/> * Thanks to this, if the semantic element is deleted the comment will be also deleted.
<BR/> * The Applied StereotypeCommentEdipart will be contains eannotation about stereotype application exactly as the editpart
<BR/> * that represents the semantic element. In this manner, it is possible to reuse mechanism of stereotype edition.
<BR/> * To ensure the creation of the comment and the synchronization of eannotation information from the Semantic editpart
<BR/> * an editpolicy will be added: the AppliedStereotypeCommentEditPolicy.
<BR/> *
<BR/> </p>

-<H5 id ="_h0sTwPy2EeWMIr2UMud8Pw">Class AppliedStereotypeCompartmentEditPart</H5>

-<p>  - specializes <a href="#_IxT1gfZ5EeWfXdmtYb4ggQ" title="Class ResizeableListCompartmentEditPart">ResizeableListCompartmentEditPart</a></p>

-<p><BR/> * this compartment is the an editpart associated to an applied stereotype<BR/> </p>

-<H5 id ="_h0358fy2EeWMIr2UMud8Pw">Class Double</H5>

-<H5 id ="_h08LYPy2EeWMIr2UMud8Pw">Class AppliedStereotypeEmptyEditPart</H5>

-<p>  - specializes <a href="#_Ix4dQvZ5EeWfXdmtYb4ggQ" title="Class GraphicalEditPart">GraphicalEditPart</a></p>

-<p>
<BR/> * This Edit Part is a dummy edit part with no figure to be linked to a Notation View that is not representing a graphical object.
<BR/> * The Views related to this edit Part are Views of type StereotypeBrace, StereotypeLabel and StereotypeBraceProperty
<BR/> * 
<BR/> * @see StereotypePropertiesEditPartProvider
<BR/> * 
<BR/> * @author Celine JANSSENS
<BR/> *
<BR/> </p>

-<H5 id ="_h1HKgPy2EeWMIr2UMud8Pw">Class AppliedStereotypeMultilinePropertyEditPart</H5>

-<p>  - specializes <a href="#_I34-ofZ5EeWfXdmtYb4ggQ" title="Class CompartmentEditPart">CompartmentEditPart</a><BR/><BR/>  - realizes <a href="#_I35lsPZ5EeWfXdmtYb4ggQ" title="Interface ITextAwareEditPart">ITextAwareEditPart</a>, <a href="#_I36z0fZ5EeWfXdmtYb4ggQ" title="Interface NotificationListener">NotificationListener</a>, <a href="#_I37a4fZ5EeWfXdmtYb4ggQ" title="Interface IPapyrusListener">IPapyrusListener</a>, <a href="#_I38B8PZ5EeWfXdmtYb4ggQ" title="Interface IControlParserForDirectEdit">IControlParserForDirectEdit</a></p>

-<p>
<BR/> * the goal of this editpart is to edit a property of an application of the stereotype into a text area
<BR/> *
<BR/> </p>

-<H5 id ="_h1SJoPy2EeWMIr2UMud8Pw">Class AppliedStereotypePropertyEditPart</H5>

-<p>  - specializes <a href="#_I9OKkPZ5EeWfXdmtYb4ggQ" title="Class UMLCompartmentEditPart">UMLCompartmentEditPart</a><BR/><BR/>  - realizes <a href="#_I35lsPZ5EeWfXdmtYb4ggQ" title="Interface ITextAwareEditPart">ITextAwareEditPart</a>, <a href="#_IvvvQPZ5EeWfXdmtYb4ggQ" title="Interface IPrimaryEditPart">IPrimaryEditPart</a></p>

-<p>
<BR/> * the goal of this editpart is to display property of stereotype in on line
<BR/> *
<BR/> </p>

-<H5 id ="_h1chsfy2EeWMIr2UMud8Pw">Class AppliedStereotypesCommentLinkEditPart</H5>

-<p>  - specializes <a href="#_I-NpEfZ5EeWfXdmtYb4ggQ" title="Class ConnectionEditPart">ConnectionEditPart</a></p>

-<p>
<BR/> *
<BR/> * The editpart AppliedSterotypesCommentLinkEditPart, the link between the stereotyped element and the comment.
<BR/> *
<BR/> </p>

-<H4 id ="_h1oH4Py2EeWMIr2UMud8Pw">Package editpolicies</H4>

-<H5 id ="_h1ryQPy2EeWMIr2UMud8Pw">Class AppliedStereotypeCommentEditPolicy</H5>

-<p>  - specializes <a href="#_JAjLYvZ5EeWfXdmtYb4ggQ" title="Class AppliedStereotypeNodeLabelDisplayEditPolicy">AppliedStereotypeNodeLabelDisplayEditPolicy</a></p>

-<p><BR/> * This editpolicy has in charge to :<BR/> * - create or destroy the appliedStereotypesCommentEditpart<BR/> * - create notation view associated to this CommentEditPart<BR/> * - refresh the Comment content based on the UML information<BR/> * by using NamedStyle mechanism into Notation model<BR/> *<BR/> *<BR/> </p>

-<H5 id ="_h12KUPy2EeWMIr2UMud8Pw">Class AppliedStereotypeCompartmentEditPolicy</H5>

-<p>  - specializes <a href="#_JAjLYvZ5EeWfXdmtYb4ggQ" title="Class AppliedStereotypeNodeLabelDisplayEditPolicy">AppliedStereotypeNodeLabelDisplayEditPolicy</a></p>

-<p><BR/> * this edit policy can be apply only on {@link IPapyrusEditPart} in order to<BR/> * access to primary figure. the primary figure has to be a {@link IPapyrusNodeUMLElementFigure}<BR/> *<BR/> </p>

-<H5 id ="_h2BJcPy2EeWMIr2UMud8Pw">Class AppliedStereotypeCompartmentForCommentShapeEditPolicy</H5>

-<p>  - specializes <a href="#_h12KUPy2EeWMIr2UMud8Pw" title="Class AppliedStereotypeCompartmentEditPolicy">AppliedStereotypeCompartmentEditPolicy</a></p>

-<p>
<BR/> * • AppliedStereotypeCompartmentForCommentShapeEditPolicy is another editpolicy attached
<BR/> * to StereotypeCommentEdipart. It does the same work as AppliedStereotypeCompartmentEditPolicy.
<BR/> * Because the StereotypeCommentEdipart is not attached to a semantic element by the attribute element of the notation view.
<BR/> * It specializes the method getUMLElement to find the semantic element
<BR/> *
<BR/> </p>

-<H5 id ="_h2LhgPy2EeWMIr2UMud8Pw">Class AppliedStereotypeLabelEditPolicy</H5>

-<p>  - specializes <a href="#_JAjLYvZ5EeWfXdmtYb4ggQ" title="Class AppliedStereotypeNodeLabelDisplayEditPolicy">AppliedStereotypeNodeLabelDisplayEditPolicy</a></p>

-<p>
<BR/> * @author Céline JANSSENS
<BR/> *         This Policy is in charge of create and delete the applied Stereotype Label Node into the Notation model
<BR/> </p>

-<H5 id ="_h2VSgfy2EeWMIr2UMud8Pw">Class AppliedStereotypePropertiesEditPolicy</H5>

-<p>  - specializes <a href="#_JAjLYvZ5EeWfXdmtYb4ggQ" title="Class AppliedStereotypeNodeLabelDisplayEditPolicy">AppliedStereotypeNodeLabelDisplayEditPolicy</a></p>

-<p>
<BR/> * This editPolicy is used to add dynamically labels of stereotypes into nodes in the context of AppliedStereorypeCompartmentEditpart
<BR/> * 
<BR/> * @deprecated. Use {@link AppliedStereotypeCompartmentEditPolicy} instead.
<BR/> </p>

-<H4 id ="_h2it4Py2EeWMIr2UMud8Pw">Package provider</H4>

-<H5 id ="_h2m_UPy2EeWMIr2UMud8Pw">Class CustomEditPolicyProvider</H5>

-<p>  - specializes <a href="#_JEVfMvZ5EeWfXdmtYb4ggQ" title="Class AbstractProvider">AbstractProvider</a><BR/><BR/>  - realizes <a href="#_JEWGQfZ5EeWfXdmtYb4ggQ" title="Interface IEditPolicyProvider">IEditPolicyProvider</a></p>

-<p>
<BR/> * this is an editpolicy provider in charge to install a policy to create a AssociationClass
<BR/> *
<BR/> * @author Patrick Tessier
<BR/> </p>

-<H5 id ="_h2xXYfy2EeWMIr2UMud8Pw">Class DisplayedProfileElementLabelProvider</H5>

-<p>  - specializes <a href="#_JHIUgvZ5EeWfXdmtYb4ggQ" title="Class LabelProvider">LabelProvider</a></p>

-<p><BR/> * The Class ProfileElementLabelProvider.<BR/> </p>

-<H5 id ="_h25TMPy2EeWMIr2UMud8Pw">Class StereotypeDisplayMigrationEditPolicyProvider</H5>

-<p>  - specializes <a href="#_JEVfMvZ5EeWfXdmtYb4ggQ" title="Class AbstractProvider">AbstractProvider</a><BR/><BR/>  - realizes <a href="#_JEWGQfZ5EeWfXdmtYb4ggQ" title="Interface IEditPolicyProvider">IEditPolicyProvider</a></p>

-<p>
<BR/> * @author Céline JANSSENS
<BR/> *
<BR/> </p>

-<H5 id ="_h3CdIPy2EeWMIr2UMud8Pw">Class StereotypePropertiesEditPartProvider</H5>

-<p>  - specializes <a href="#_JJQbcPZ5EeWfXdmtYb4ggQ" title="Class RestrictedAbstractEditPartProvider">RestrictedAbstractEditPartProvider</a></p>

-<H2 id ="_h3HVofy2EeWMIr2UMud8Pw">Tests</H2>

-<H3 id ="_h3KY8Py2EeWMIr2UMud8Pw">Package Display applied stereotype name</H3>

-<H4 id ="_h3NcQPy2EeWMIr2UMud8Pw">Use Case Apply two stereotypes</H4>

-<p>Create a class, apply stereotype1 and stereotype2, verify if their names are displayed</p>

-<H4 id ="_h3VYEPy2EeWMIr2UMud8Pw">Use Case Drop a stereotyped class</H4>

-<p>Create a class in the model explorer, stereotype it by "stereotype1", drop it into the class diagram.
<BR/>Test if the label of the applied stereotype name  is displayed </p>

-<H4 id ="_h3cs0fy2EeWMIr2UMud8Pw">Use Case Apply a stereotype</H4>

-<p>Create a class on the class diagram, apply "stereotype1" on this class. Test if the "stereotype1" is displayed under the name.</p>

-<H4 id ="_h3hlUPy2EeWMIr2UMud8Pw">Use Case Use a CSS</H4>

-<p> Open a papyrus file where a class is stereotyped by Stereotype1
<BR/> This class should display 17 properties.
<BR/> But a CSS has been added and only one property must be visible only on the class .
<BR/> Verify that all properties for the applied stereotype are displayed.</p>

-<H4 id ="_h3l2wfy2EeWMIr2UMud8Pw">Use Case Use Property View</H4>

-<p> Open a papyrus file where a class is stereotyped by Stereotype1
<BR/> This class should display 17 properties.
<BR/> But the display has change by slected only one property to display
<BR/> Verify that all properties for the applied stereotype are displayed.</p>

-<H3 id ="_h3qvQPy2EeWMIr2UMud8Pw">Package Display applied stereotype properties as comment</H3>

-<H4 id ="_h3skcfy2EeWMIr2UMud8Pw">Use Case Display stereotype as Comment</H4>

-<p>Create a class on the class diagram, apply "stereotype3" on this class. Display property of sterotype as comment.
<BR/>Verify that all properties fo the applied stereotype  are displayed.</p>

-<H4 id ="_h3z5MPy2EeWMIr2UMud8Pw">Use Case Reopen file with a display of  stereotype as Comment</H4>

-<p>Reopen a file in which applied stereotypes are displayed as comment for a class an dependency.
<BR/>Verify that all properties fo the applied stereotype  are displayed.</p>

-<H3 id ="_h37N8fy2EeWMIr2UMud8Pw">Package Display applied stereotype properties as brace</H3>

-<H4 id ="_h3_fYPy2EeWMIr2UMud8Pw">Use Case Display stereotype as brace</H4>

-<p>Create a class on the class diagram, apply "stereotype3" on this class. Display property of sterotype as brace.
<BR/>Verify that the label is created and verify its content.</p>

-<H4 id ="_h4ICQPy2EeWMIr2UMud8Pw">Use Case Reopen file with a display of  stereotype as brace</H4>

-<p>Reopen a file in which applied stereotypes are displayed as brace .
<BR/>Verify that all properties fo the applied stereotype  are displayed.</p>

-<H3 id ="_h4PXAPy2EeWMIr2UMud8Pw">Package Display applied stereotype properties as compartment</H3>

-<H4 id ="_h4TocPy2EeWMIr2UMud8Pw">Use Case Display stereotype as compartment</H4>

-<p>Create a class on the class diagram, apply "stereotype3" on this class. Display property of sterotype as compartment
<BR/>Verify that the compartment is created and verify that all properties of stereotype are displayed.</p>

-<H4 id ="_h4a9MPy2EeWMIr2UMud8Pw">Use Case Reopen file with a display of  stereotype as compartment</H4>

-<p>Reopen a file in which applied stereotypes are displayed as compartment only on the class .
<BR/> Verify that all properties for the applied stereotype are displayed.</p>

-<H3 id ="_h4i5APy2EeWMIr2UMud8Pw">Package qualifiedName</H3>

-<H4 id ="_h4mjYPy2EeWMIr2UMud8Pw">Use Case Display the full qualified name </H4>

-<p>Create a class.
<BR/>Apply stereotype1.
<BR/>Set the depht to full, the name of the profile must be display in the label of applied stereotype</p>

-<H3 id ="_h4sqAfy2EeWMIr2UMud8Pw">Package remove</H3>

-<H4 id ="_h4wUYPy2EeWMIr2UMud8Pw">Use Case Unapply Stereotype</H4>

-<p>Open a model with a stereotype that is apply on the class with the display as compartment.
<BR/>Unapply the stereotype.
<BR/>The compartment must disappear.</p>

-<H4 id ="_h42bAPy2EeWMIr2UMud8Pw">Use Case Unapply Profile</H4>

-<p>Open a model with a stereotype that is apply on the class with the display as compartment.
<BR/>Unapply the profile
<BR/>The compartment must disappear.</p>

-<H3 id ="_h48hofy2EeWMIr2UMud8Pw">Package update</H3>

-<H4 id ="_h5AMAPy2EeWMIr2UMud8Pw">Use Case Unapply value associated to the property of stereotype</H4>

-<p>Open a model with a stereotype that is apply on the class with the display as compartment.
<BR/>Observe the value of the stereotype.
<BR/>Change the value.
<BR/>The display must have changed.</p>

-<H2 id ="_h5FEgPy2EeWMIr2UMud8Pw">Requirements Coverage</H2>

-<table style="border-collapse: collapse;"><caption style="caption-side: bottom;">RequirementsCoverageTable</caption><tr><th style="border: 1px solid black">Id</th><th style="border: 1px solid black">Satisfied by</th><th style="border: 1px solid black">Verified by</th></tr>

-<tr><td style="border : 1px solid black"><a href="#_hl_wcPy2EeWMIr2UMud8Pw" title="Stereotype application properties dipslay">REQ_001</a><BR/>

-</td><td style="border : 1px solid black">Display stereotype properties<BR/>

-</td><td style="border : 1px solid black"><a href="#_h3skcfy2EeWMIr2UMud8Pw" title="Display stereotype as Comment">Display stereotype as Comment, 
-</a><BR/>

-<a href="#_h4TocPy2EeWMIr2UMud8Pw" title="Display stereotype as compartment">Display stereotype as compartment, 
-</a><BR/>

-<a href="#_h3_fYPy2EeWMIr2UMud8Pw" title="Display stereotype as brace">Display stereotype as brace, 
-</a><BR/>

-<a href="#_h3z5MPy2EeWMIr2UMud8Pw" title="Reopen file with a display of  stereotype as Comment">Reopen file with a display of  stereotype as Comment, 
-</a><BR/>

-<a href="#_h3hlUPy2EeWMIr2UMud8Pw" title="Use a CSS">Use a CSS, 
-</a><BR/>

-<a href="#_h4ICQPy2EeWMIr2UMud8Pw" title="Reopen file with a display of  stereotype as brace">Reopen file with a display of  stereotype as brace, 
-</a><BR/>

-<a href="#_h4a9MPy2EeWMIr2UMud8Pw" title="Reopen file with a display of  stereotype as compartment">Reopen file with a display of  stereotype as compartment</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmEB4Py2EeWMIr2UMud8Pw" title="Display Requirement as a "comment"">REQ_0011</a><BR/>

-</td><td style="border : 1px solid black">As "Comment"<BR/>

-</td><td style="border : 1px solid black"><a href="#_h3skcfy2EeWMIr2UMud8Pw" title="Display stereotype as Comment">Display stereotype as Comment, 
-</a><BR/>

-<a href="#_h3z5MPy2EeWMIr2UMud8Pw" title="Reopen file with a display of  stereotype as Comment">Reopen file with a display of  stereotype as Comment</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmITUPy2EeWMIr2UMud8Pw" title="Display Requirement as a "compartment"">REQ_0012</a><BR/>

-</td><td style="border : 1px solid black">As "compartment"<BR/>

-</td><td style="border : 1px solid black"><a href="#_h4TocPy2EeWMIr2UMud8Pw" title="Display stereotype as compartment">Display stereotype as compartment, 
-</a><BR/>

-<a href="#_h4a9MPy2EeWMIr2UMud8Pw" title="Reopen file with a display of  stereotype as compartment">Reopen file with a display of  stereotype as compartment</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmL9sPy2EeWMIr2UMud8Pw" title="Display Requirement as a "brace"">REQ_0013</a><BR/>

-</td><td style="border : 1px solid black">As "brace"<BR/>

-</td><td style="border : 1px solid black"><a href="#_h3_fYPy2EeWMIr2UMud8Pw" title="Display stereotype as brace">Display stereotype as brace, 
-</a><BR/>

-<a href="#_h4ICQPy2EeWMIr2UMud8Pw" title="Reopen file with a display of  stereotype as brace">Reopen file with a display of  stereotype as brace</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmPBAfy2EeWMIr2UMud8Pw" title="Display stereotype name">REQ_002</a><BR/>

-</td><td style="border : 1px solid black">Display applied stereotype name<BR/>

-</td><td style="border : 1px solid black"><a href="#_h3cs0fy2EeWMIr2UMud8Pw" title="Apply a stereotype">Apply a stereotype, 
-</a><BR/>

-<a href="#_h4mjYPy2EeWMIr2UMud8Pw" title="Display the full qualified name ">Display the full qualified name </a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmSEUPy2EeWMIr2UMud8Pw" title="Apply a stereotype">REQ_0021</a><BR/>

-</td><td style="border : 1px solid black">Display applied stereotype name<BR/>

-</td><td style="border : 1px solid black"><a href="#_h3cs0fy2EeWMIr2UMud8Pw" title="Apply a stereotype">Apply a stereotype</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmUgkPy2EeWMIr2UMud8Pw" title="Drop from  the model explorer">REQ_0022</a><BR/>

-</td><td style="border : 1px solid black">Display applied stereotype name<BR/>

-</td><td style="border : 1px solid black"><a href="#_h3VYEPy2EeWMIr2UMud8Pw" title="Drop a stereotyped class">Drop a stereotyped class</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmW80fy2EeWMIr2UMud8Pw" title="Display the name of the stereotype ">REQ_0023</a><BR/>

-</td><td style="border : 1px solid black">Display applied stereotype name<BR/>

-</td><td style="border : 1px solid black"><a href="#_h3NcQPy2EeWMIr2UMud8Pw" title="Apply two stereotypes">Apply two stereotypes, 
-</a><BR/>

-<a href="#_h3VYEPy2EeWMIr2UMud8Pw" title="Drop a stereotyped class">Drop a stereotyped class, 
-</a><BR/>

-<a href="#_h3cs0fy2EeWMIr2UMud8Pw" title="Apply a stereotype">Apply a stereotype</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmaAIPy2EeWMIr2UMud8Pw" title="Display each applied stereotype name differently">REQ_0024</a><BR/>

-</td><td style="border : 1px solid black">Display applied stereotype name<BR/>

-</td><td style="border : 1px solid black"><a href="#_h3NcQPy2EeWMIr2UMud8Pw" title="Apply two stereotypes">Apply two stereotypes</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmdDcPy2EeWMIr2UMud8Pw" title="Qualified name depth">REQ_003</a><BR/>

-</td><td style="border : 1px solid black">Choose QN depth<BR/>

-</td><td style="border : 1px solid black"><a href="#_h4mjYPy2EeWMIr2UMud8Pw" title="Display the full qualified name ">Display the full qualified name </a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmffsPy2EeWMIr2UMud8Pw" title="Choice on Stereotype properties to display">REQ_004</a><BR/>

-</td><td style="border : 1px solid black">Choose properties to display<BR/>

-</td><td style="border : 1px solid black"><a href="#_h3hlUPy2EeWMIr2UMud8Pw" title="Use a CSS">Use a CSS, 
-</a><BR/>

-<a href="#_h3l2wfy2EeWMIr2UMud8Pw" title="Use Property View">Use Property View</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmh78Py2EeWMIr2UMud8Pw" title="Use CSS file">REQ_0041</a><BR/>

-</td><td style="border : 1px solid black">Choose properties to display<BR/>

-</td><td style="border : 1px solid black"><a href="#_h3hlUPy2EeWMIr2UMud8Pw" title="Use a CSS">Use a CSS</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmjxIfy2EeWMIr2UMud8Pw" title="Use property view">REQ_0042</a><BR/>

-</td><td style="border : 1px solid black">Choose properties to display<BR/>

-</td><td style="border : 1px solid black"><a href="#_h3l2wfy2EeWMIr2UMud8Pw" title="Use Property View">Use Property View</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmmNYfy2EeWMIr2UMud8Pw" title="Remove display of applied stereotype ">REQ_005</a><BR/>

-</td><td style="border : 1px solid black">Remove display of stereotype properties<BR/>

-</td><td style="border : 1px solid black"><a href="#_h4wUYPy2EeWMIr2UMud8Pw" title="Unapply Stereotype">Unapply Stereotype, 
-</a><BR/>

-<a href="#_h42bAPy2EeWMIr2UMud8Pw" title="Unapply Profile">Unapply Profile</a><BR/>

-</td></tr>

-<tr><td style="border : 1px solid black"><a href="#_hmopofy2EeWMIr2UMud8Pw" title="Update display">REQ_006</a><BR/>

-</td><td style="border : 1px solid black">Update the display of applied stereotype properties<BR/>

-</td><td style="border : 1px solid black"><a href="#_h5AMAPy2EeWMIr2UMud8Pw" title="Unapply value associated to the property of stereotype">Unapply value associated to the property of stereotype</a><BR/>

-</td></tr>

-</table>

-<p>Unsatisfied requirements (0 out of 15) : </p>

-<p>Unverified requirements (0 out of 15) : </p>

-</html>

diff --git a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
index ae2fda9fa0a..27319305937 100644
--- a/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
+++ b/plugins/infra/newchild/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
@@ -344,12 +344,12 @@ public class CreationMenuFactory {
 	/**
 	 * get the IelementType from a string
 	 *
-	 * @param extendedType
+	 * @param elementType
 	 *            the string that represents the element type
 	 * @return the element type or null
 	 */
-	protected IElementType getElementType(String extendedType) {
-		return ElementTypeRegistry.getInstance().getType(extendedType);
+	protected IElementType getElementType(String elementType) {
+		return ElementTypeRegistry.getInstance().getType(elementType);
 	}
 
 	/**
@@ -359,8 +359,8 @@ public class CreationMenuFactory {
 	 *            the role of the element that will be created (maybe null)
 	 * @param container
 	 *            the container of the created elements
-	 * @param extendedType
-	 *            the extended type of the created element
+	 * @param adviceCache
+	 * 
 	 * @return a command that can be executed by the domain
 	 */
 	protected Command buildCommand(EReference reference, EObject container, CreationMenu creationMenu, Map<?, ?> adviceCache) {
@@ -445,14 +445,12 @@ public class CreationMenuFactory {
 	 * Creates a dialog for selecting the target element
 	 * 
 	 * @param eobject
-	 * @param reference
-	 * @param extendedType
 	 * @param provider
+	 * @param ted
+	 * @param reference
 	 * @param container
-	 * @param possibleTargets
-	 * @param directedRelationship
-	 * 
-	 * @return the dialog
+	 * @param et
+	 * @return
 	 */
 	protected TreeSelectorDialog getTargetTreeSelectorDialog(EObject eobject, final IElementEditService provider,
 			final TransactionalEditingDomain ted,
diff --git a/plugins/infra/pom.xml b/plugins/infra/pom.xml
index c347c3a4531..91442858b0d 100644
--- a/plugins/infra/pom.xml
+++ b/plugins/infra/pom.xml
@@ -31,7 +31,6 @@
 		<module>nattable/org.eclipse.papyrus.infra.nattable.gmfdiag</module>
 
 		<module>ui</module>
-		<module>xtypes</module>
 		<module>misc</module>
 		<module>discovery</module>
 	</modules>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleEditHelperAdvice.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleEditHelperAdvice.java
index acc5746cf18..b78e124449d 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleEditHelperAdvice.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleEditHelperAdvice.java
@@ -163,16 +163,16 @@ public class DefaultRuleEditHelperAdvice extends AbstractEditHelperAdvice {
 		if (superTypes.length == 0) {
 			return Collections.emptyList();
 		}
-		List<ConfiguredHintedSpecializationElementType> superExtendedTypes = new ArrayList<ConfiguredHintedSpecializationElementType>();
+		List<ConfiguredHintedSpecializationElementType> superElementTypes = new ArrayList<ConfiguredHintedSpecializationElementType>();
 		// get the reverse order
 		for (int i = superTypes.length - 1; i >= 0; i--) {
 			if (superTypes[i] instanceof ConfiguredHintedSpecializationElementType) {
 				if (((ConfiguredHintedSpecializationElementType) superTypes[i]).getConfiguration() instanceof RuleBasedTypeConfiguration) {
-					superExtendedTypes.add((ConfiguredHintedSpecializationElementType) superTypes[i]);
+					superElementTypes.add((ConfiguredHintedSpecializationElementType) superTypes[i]);
 				}
 			}
 		}
-		return superExtendedTypes;
+		return superElementTypes;
 	}
 
 
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.classpath b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.classpath
deleted file mode 100644
index 240e23bfdc0..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.project
deleted file mode 100644
index 9d243ef8973..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.extendedtypes.edit</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0de02b374f2..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,295 +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.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-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/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 7da108ff59d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)"
-Export-Package: org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.provider,
- org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider,
- org.eclipse.papyrus.infra.extendedtypes.provider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/about.html b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/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/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/build.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/build.properties
deleted file mode 100644
index 9c53427d507..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2013 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:
-#  CEA LIST - Initial API and implementation
-
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src-gen/,\
-           src/
-output.. = bin/
-src.includes = about.html
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateActionConfiguration_preValidationQueryConfiguration_ModiscoQueryConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateActionConfiguration_preValidationQueryConfiguration_ModiscoQueryConfiguration.gif
deleted file mode 100644
index d75e4636bcb..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateActionConfiguration_preValidationQueryConfiguration_ModiscoQueryConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectSemanticTypeConfiguration_adviceConfiguration_AspectSemanticTypeAdviceConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectSemanticTypeConfiguration_adviceConfiguration_AspectSemanticTypeAdviceConfiguration.gif
deleted file mode 100644
index 48054300c70..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectSemanticTypeConfiguration_adviceConfiguration_AspectSemanticTypeAdviceConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectViewTypeConfiguration_adviceConfiguration_AspectViewTypeAdviceConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectViewTypeConfiguration_adviceConfiguration_AspectViewTypeAdviceConfiguration.gif
deleted file mode 100644
index 8640819ef61..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateAspectViewTypeConfiguration_adviceConfiguration_AspectViewTypeAdviceConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateConfigurationElement_iconEntry_IconEntry.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateConfigurationElement_iconEntry_IconEntry.gif
deleted file mode 100644
index f33bed84b34..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateConfigurationElement_iconEntry_IconEntry.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectSemanticTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectSemanticTypeConfiguration.gif
deleted file mode 100644
index dea9e2d9379..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectSemanticTypeConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectViewTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectViewTypeConfiguration.gif
deleted file mode 100644
index 1f765e12d39..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_AspectViewTypeConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_InvariantSemanticTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_InvariantSemanticTypeConfiguration.gif
deleted file mode 100644
index ddad704eaf3..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateExtendedElementTypeSet_elementType_InvariantSemanticTypeConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantContainerConfiguration_permissions_HierarchyPermission.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantContainerConfiguration_permissions_HierarchyPermission.gif
deleted file mode 100644
index 86ec735a156..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantContainerConfiguration_permissions_HierarchyPermission.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantHierarchyConfiguration_permissions_HierarchyPermission.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantHierarchyConfiguration_permissions_HierarchyPermission.gif
deleted file mode 100644
index 7afe9dc1af9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantHierarchyConfiguration_permissions_HierarchyPermission.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantConfiguration_InvariantHierarchyConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantConfiguration_InvariantHierarchyConfiguration.gif
deleted file mode 100644
index 5fcdce8997b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantConfiguration_InvariantHierarchyConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_AndRule.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_AndRule.gif
deleted file mode 100644
index 285bf7f552c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_AndRule.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_OrRule.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_OrRule.gif
deleted file mode 100644
index 412157824c8..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_OrRule.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AndRule.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AndRule.gif
deleted file mode 100644
index 33a997a1606..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AndRule.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeAdviceConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeAdviceConfiguration.gif
deleted file mode 100644
index c414fe9f728..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeAdviceConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeConfiguration.gif
deleted file mode 100644
index 89ad5da38ab..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectSemanticTypeConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeAdviceConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeAdviceConfiguration.gif
deleted file mode 100644
index 8a5c70cbd74..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeAdviceConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeConfiguration.gif
deleted file mode 100644
index 7b7c428c715..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/AspectViewTypeConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ElementTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ElementTypeConfiguration.gif
deleted file mode 100644
index 94c953e013b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ElementTypeConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ExtendedElementTypeSet.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ExtendedElementTypeSet.gif
deleted file mode 100644
index e4bc22dd17e..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/ExtendedElementTypeSet.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/HierarchyPermission.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/HierarchyPermission.gif
deleted file mode 100644
index c4a8af41844..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/HierarchyPermission.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/IconEntry.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/IconEntry.gif
deleted file mode 100644
index caf2804510d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/IconEntry.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantConfiguration.gif
deleted file mode 100644
index ef56c140853..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantContainerConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantContainerConfiguration.gif
deleted file mode 100644
index 134551bff7e..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantContainerConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantHierarchyConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantHierarchyConfiguration.gif
deleted file mode 100644
index 420eee17752..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantHierarchyConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantSemanticTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantSemanticTypeConfiguration.gif
deleted file mode 100644
index ef56c140853..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/InvariantSemanticTypeConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/OrRule.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/OrRule.gif
deleted file mode 100644
index 48e3cf22687..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/icons/full/obj16/OrRule.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.properties
deleted file mode 100644
index 7f6dd5b031a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright (c) 2013 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:
-#  CEA LIST - Initial API and implementation
-
-pluginName = InvariantHierarchyConfiguration Edit Support
-providerName = Eclipse Modeling Project
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} | {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_Unknown_datatype= Value
-
-_UI_InvariantSemanticTypeConfiguration_type = Invariant Semantic Type Configuration
-_UI_InvariantConfiguration_type = Invariant Configuration
-_UI_InvariantSemanticTypeConfiguration_invariantConfiguration_feature = Invariant Configuration
-_UI_InvariantConfiguration_parentType_feature = Parent Type
-_UI_ExtendedElementTypeSet_type = Extended Element Type Set
-_UI_ElementTypeConfiguration_type = Element Type Configuration
-_UI_IconEntry_type = Icon Entry
-_UI_ConfigurationElement_type = Configuration Element
-_UI_ViewTypeAdviceConfiguration_type = View Type Advice Configuration
-_UI_SemanticTypeAdviceConfiguration_type = Semantic Type Advice Configuration
-_UI_MatcherConfiguration_type = Matcher Configuration
-_UI_ActionConfiguration_type = Action Configuration
-_UI_ViewActionConfiguration_type = View Action Configuration
-_UI_SemanticActionConfiguration_type = Semantic Action Configuration
-_UI_SemanticTypeConfiguration_type = Semantic Type Configuration
-_UI_ViewTypeConfiguration_type = View Type Configuration
-_UI_ElementTypeAdviceConfiguration_type = Element Type Advice Configuration
-_UI_ExtendedElementTypeSet_elementType_feature = Element Type
-_UI_ElementTypeConfiguration_hint_feature = Hint
-_UI_ElementTypeConfiguration_kindName_feature = Kind Name
-_UI_ElementTypeConfiguration_specializedTypesID_feature = Specialized Types ID
-_UI_IconEntry_iconPath_feature = Icon Path
-_UI_IconEntry_bundleId_feature = Bundle Id
-_UI_ConfigurationElement_name_feature = Name
-_UI_ConfigurationElement_description_feature = Description
-_UI_ConfigurationElement_identifier_feature = Identifier
-_UI_ConfigurationElement_iconEntry_feature = Icon Entry
-_UI_ActionConfiguration_preValidationQueryConfiguration_feature = Pre Validation Query Configuration
-_UI_ViewTypeConfiguration_specializedDiagramTypeID_feature = Specialized Diagram Type ID
-_UI_ElementTypeAdviceConfiguration_matcherConfiguration_feature = Matcher Configuration
-_UI_AspectSemanticTypeConfiguration_type = Aspect Semantic Type Configuration
-_UI_AspectSemanticTypeAdviceConfiguration_type = Semantic Type Advice Configuration
-_UI_AspectSemanticTypeConfiguration_adviceConfiguration_feature = Advice Configuration
-_UI_AspectSemanticTypeAdviceConfiguration_preActionConfiguration_feature = Pre Action Configuration
-_UI_AspectSemanticTypeAdviceConfiguration_postActionConfiguration_feature = Post Action Configuration
-_UI_Unknown_feature = Unspecified
-
-_UI_InvariantHierarchyConfiguration_type = Invariant Hierarchy Configuration
-_UI_HierarchyPermission_type = Hierarchy Permission
-_UI_Unknown_type = Object
-
_UI_InvariantHierarchyConfiguration_permissions_feature = Permissions
-_UI_HierarchyPermission_parentType_feature = Parent Type
-_UI_HierarchyPermission_isPermitted_feature = Is Permitted
-_UI_HierarchyPermission_directContainerLevelOnly_feature = Direct Container Level Only
-_UI_ExtendedElementTypeSet_extensible_feature = Extensible
-_UI_InvariantRuleConfiguration_type = Invariant Rule Configuration
-_UI_ComposedRuleConfiguration_type = Composed Rule Configuration
-_UI_AndRule_type = And Rule
-_UI_OrRule_type = Or Rule
-_UI_InvariantSemanticTypeConfiguration_invariantRuleConfiguration_feature = Invariant Rule Configuration
-_UI_ComposedRuleConfiguration_composedRules_feature = Composed Rules
-_UI_ElementTypeConfiguration_matcherConfiguration_feature = Matcher Configuration
-_UI_HierarchyPermission_isStrict_feature = Is Strict
-_UI_InvariantContainerConfiguration_type = Invariant Container Configuration
-_UI_InvariantContainerConfiguration_permissions_feature = Permissions
-_UI_HierarchyPermission_childType_feature = Child Type
-_UI_AspectViewTypeConfiguration_type = Aspect View Type Configuration
-_UI_AspectViewTypeAdviceConfiguration_type = Aspect View Type Advice Configuration
-_UI_AspectViewTypeConfiguration_adviceConfiguration_feature = Advice Configuration
-_UI_AspectViewTypeAdviceConfiguration_preActionConfiguration_feature = Pre Action Configuration
-_UI_AspectViewTypeAdviceConfiguration_postActionConfiguration_feature = Post Action Configuration
-_UI_AspectSemanticTypeConfiguration_actionConfiguration_feature = Action Configuration
-_UI_AspectViewTypeConfiguration_actionConfiguration_feature = Action Configuration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.xml
deleted file mode 100644
index d3502964191..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/plugin.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright (c) 2013 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:
-  CEA LIST - Initial API and implementation
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated InvariantSemanticTypeConfiguration -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"
-            class="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider.InvariantSemanticTypeConfigurationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <!-- @generated InvariantSemanticTypeConfiguration -->
-      <extender
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"
-            class="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider.InvariantSemanticTypeConfigurationItemProviderAdapterFactory$ExtendedtypesChildCreationExtender"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated ExtendedTypes -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"
-            class="org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedtypesItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated InvariantContainerConfiguration -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0"
-            class="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.provider.InvariantContainerConfigurationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-
-</plugin>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml
deleted file mode 100644
index 4354ed19721..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.infra-xtypes</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.extendedtypes.edit</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/HierarchyPermissionItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/HierarchyPermissionItemProvider.java
deleted file mode 100644
index 6d9f8826f4b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/HierarchyPermissionItemProvider.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class HierarchyPermissionItemProvider
-		extends ItemProviderAdapter
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public HierarchyPermissionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addChildTypePropertyDescriptor(object);
-			addIsPermittedPropertyDescriptor(object);
-			addIsStrictPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Child Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addChildTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_HierarchyPermission_childType_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_childType_feature", "_UI_HierarchyPermission_type"),
-						InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION__CHILD_TYPE,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Permitted feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addIsPermittedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_HierarchyPermission_isPermitted_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_isPermitted_feature", "_UI_HierarchyPermission_type"),
-						InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION__IS_PERMITTED,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Strict feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addIsStrictPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_HierarchyPermission_isStrict_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_isStrict_feature", "_UI_HierarchyPermission_type"),
-						InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION__IS_STRICT,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns HierarchyPermission.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/HierarchyPermission"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((HierarchyPermission) object).getChildType();
-		return label == null || label.length() == 0 ?
-				getString("_UI_HierarchyPermission_type") :
-				getString("_UI_HierarchyPermission_type") + " " + label;
-	}
-
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(HierarchyPermission.class)) {
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return InvariantContainerConfigurationEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationEditPlugin.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationEditPlugin.java
deleted file mode 100644
index 8a8ea3fb28b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationEditPlugin.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider.InvariantSemanticTypeConfigurationEditPlugin;
-import org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin;
-
-/**
- * This is the central singleton for the InvariantContainerConfiguration edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public final class InvariantContainerConfigurationEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final InvariantContainerConfigurationEditPlugin INSTANCE = new InvariantContainerConfigurationEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantContainerConfigurationEditPlugin() {
-		super(new ResourceLocator[] {
-				EcoreEditPlugin.INSTANCE,
-				ExtendedTypesEditPlugin.INSTANCE,
-				InvariantSemanticTypeConfigurationEditPlugin.INSTANCE,
-		});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProvider.java
deleted file mode 100644
index 88b0f705682..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProvider.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider.InvariantRuleConfigurationItemProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantContainerConfigurationItemProvider
-		extends InvariantRuleConfigurationItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantContainerConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(InvariantContainerConfigurationPackage.Literals.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns InvariantContainerConfiguration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InvariantContainerConfiguration"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_InvariantContainerConfiguration_type");
-	}
-
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(InvariantContainerConfiguration.class)) {
-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-				(createChildParameter
-				(InvariantContainerConfigurationPackage.Literals.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS,
-						InvariantContainerConfigurationFactory.eINSTANCE.createHierarchyPermission()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return InvariantContainerConfigurationEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProviderAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProviderAdapterFactory.java
deleted file mode 100644
index 0c606b43a41..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/provider/InvariantContainerConfigurationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util.InvariantContainerConfigurationAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantContainerConfigurationItemProviderAdapterFactory extends InvariantContainerConfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantContainerConfigurationItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected InvariantContainerConfigurationItemProvider invariantContainerConfigurationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createInvariantContainerConfigurationAdapter() {
-		if (invariantContainerConfigurationItemProvider == null) {
-			invariantContainerConfigurationItemProvider = new InvariantContainerConfigurationItemProvider(this);
-		}
-
-		return invariantContainerConfigurationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected HierarchyPermissionItemProvider hierarchyPermissionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createHierarchyPermissionAdapter() {
-		if (hierarchyPermissionItemProvider == null) {
-			hierarchyPermissionItemProvider = new HierarchyPermissionItemProvider(this);
-		}
-
-		return hierarchyPermissionItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void dispose() {
-		if (invariantContainerConfigurationItemProvider != null) {
-			invariantContainerConfigurationItemProvider.dispose();
-		}
-		if (hierarchyPermissionItemProvider != null) {
-			hierarchyPermissionItemProvider.dispose();
-		}
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/AndRuleItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/AndRuleItemProvider.java
deleted file mode 100644
index 019bd8f0cd0..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/AndRuleItemProvider.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class AndRuleItemProvider
-		extends ComposedRuleConfigurationItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public AndRuleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns AndRule.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AndRule"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_AndRule_type");
-	}
-
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/ComposedRuleConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/ComposedRuleConfigurationItemProvider.java
deleted file mode 100644
index 7458d1fd97b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/ComposedRuleConfigurationItemProvider.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ComposedRuleConfigurationItemProvider
-		extends InvariantRuleConfigurationItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ComposedRuleConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addComposedRulesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Composed Rules feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addComposedRulesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_ComposedRuleConfiguration_composedRules_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_ComposedRuleConfiguration_composedRules_feature", "_UI_ComposedRuleConfiguration_type"),
-						InvariantSemanticTypeConfigurationPackage.Literals.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES,
-						true,
-						false,
-						true,
-						null,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ComposedRuleConfiguration_type");
-	}
-
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantRuleConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantRuleConfigurationItemProvider.java
deleted file mode 100644
index 3426aba9852..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantRuleConfigurationItemProvider.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantRuleConfigurationItemProvider
-		extends ItemProviderAdapter
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantRuleConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_InvariantRuleConfiguration_type");
-	}
-
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return InvariantSemanticTypeConfigurationEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationEditPlugin.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationEditPlugin.java
deleted file mode 100644
index 6f67da530a3..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationEditPlugin.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-import org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin;
-
-/**
- * This is the central singleton for the InvariantSemanticTypeConfiguration edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public final class InvariantSemanticTypeConfigurationEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final InvariantSemanticTypeConfigurationEditPlugin INSTANCE = new InvariantSemanticTypeConfigurationEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfigurationEditPlugin() {
-		super(new ResourceLocator[] {
-				EcoreEditPlugin.INSTANCE,
-				ExtendedTypesEditPlugin.INSTANCE,
-		});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProvider.java
deleted file mode 100644
index 7e6a08eb62f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProvider.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.provider.SemanticTypeConfigurationItemProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantSemanticTypeConfigurationItemProvider
-		extends SemanticTypeConfigurationItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns InvariantSemanticTypeConfiguration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InvariantSemanticTypeConfiguration"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((InvariantSemanticTypeConfiguration) object).getName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_InvariantSemanticTypeConfiguration_type") :
-				getString("_UI_InvariantSemanticTypeConfiguration_type") + " " + label;
-	}
-
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(InvariantSemanticTypeConfiguration.class)) {
-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-				(createChildParameter
-				(InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,
-						InvariantSemanticTypeConfigurationFactory.eINSTANCE.createAndRule()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,
-						InvariantSemanticTypeConfigurationFactory.eINSTANCE.createOrRule()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return InvariantSemanticTypeConfigurationEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProviderAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProviderAdapterFactory.java
deleted file mode 100644
index 726f8df40a4..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/InvariantSemanticTypeConfigurationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util.InvariantSemanticTypeConfigurationAdapterFactory;
-import org.eclipse.papyrus.infra.extendedtypes.util.ExtendedtypesSwitch;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantSemanticTypeConfigurationItemProviderAdapterFactory extends InvariantSemanticTypeConfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfigurationItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected InvariantSemanticTypeConfigurationItemProvider invariantSemanticTypeConfigurationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createInvariantSemanticTypeConfigurationAdapter() {
-		if (invariantSemanticTypeConfigurationItemProvider == null) {
-			invariantSemanticTypeConfigurationItemProvider = new InvariantSemanticTypeConfigurationItemProvider(this);
-		}
-
-		return invariantSemanticTypeConfigurationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected AndRuleItemProvider andRuleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createAndRuleAdapter() {
-		if (andRuleItemProvider == null) {
-			andRuleItemProvider = new AndRuleItemProvider(this);
-		}
-
-		return andRuleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected OrRuleItemProvider orRuleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createOrRuleAdapter() {
-		if (orRuleItemProvider == null) {
-			orRuleItemProvider = new OrRuleItemProvider(this);
-		}
-
-		return orRuleItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void dispose() {
-		if (invariantSemanticTypeConfigurationItemProvider != null) {
-			invariantSemanticTypeConfigurationItemProvider.dispose();
-		}
-		if (andRuleItemProvider != null) {
-			andRuleItemProvider.dispose();
-		}
-		if (orRuleItemProvider != null) {
-			orRuleItemProvider.dispose();
-		}
-	}
-
-	/**
-	 * A child creation extender for the {@link ExtendedtypesPackage}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static class ExtendedtypesChildCreationExtender implements IChildCreationExtender {
-		/**
-		 * The switch for creating child descriptors specific to each extended class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected static class CreationSwitch extends ExtendedtypesSwitch<Object> {
-			/**
-			 * The child descriptors being populated.
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 *
-			 * @generated
-			 */
-			protected List<Object> newChildDescriptors;
-
-			/**
-			 * The domain in which to create the children.
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 *
-			 * @generated
-			 */
-			protected EditingDomain editingDomain;
-
-			/**
-			 * Creates the a switch for populating child descriptors in the given domain.
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 *
-			 * @generated
-			 */
-			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
-				this.newChildDescriptors = newChildDescriptors;
-				this.editingDomain = editingDomain;
-			}
-
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 *
-			 * @generated
-			 */
-			@Override
-			public Object caseExtendedElementTypeSet(ExtendedElementTypeSet object) {
-				newChildDescriptors.add
-						(createChildParameter
-						(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType(),
-								InvariantSemanticTypeConfigurationFactory.eINSTANCE.createInvariantSemanticTypeConfiguration()));
-
-				return null;
-			}
-
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 *
-			 * @generated
-			 */
-			protected CommandParameter createChildParameter(Object feature, Object child) {
-				return new CommandParameter(null, feature, child);
-			}
-
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
-			ArrayList<Object> result = new ArrayList<Object>();
-			new CreationSwitch(result, editingDomain).doSwitch((EObject) object);
-			return result;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public ResourceLocator getResourceLocator() {
-			return InvariantSemanticTypeConfigurationEditPlugin.INSTANCE;
-		}
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/OrRuleItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/OrRuleItemProvider.java
deleted file mode 100644
index ff9d0f567f7..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/OrRuleItemProvider.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class OrRuleItemProvider
-		extends ComposedRuleConfigurationItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public OrRuleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns OrRule.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/OrRule"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_OrRule_type");
-	}
-
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ActionConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ActionConfigurationItemProvider.java
deleted file mode 100644
index e76723e842a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ActionConfigurationItemProvider.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ActionConfigurationItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ActionConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ActionConfiguration) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ActionConfiguration_type") : //$NON-NLS-1$
-				getString("_UI_ActionConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectSemanticTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectSemanticTypeConfigurationItemProvider.java
deleted file mode 100644
index 8a151e4ddca..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectSemanticTypeConfigurationItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class AspectSemanticTypeConfigurationItemProvider extends SemanticTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public AspectSemanticTypeConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ExtendedtypesPackage.eINSTANCE.getAspectSemanticTypeConfiguration_ActionConfiguration());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns AspectSemanticTypeConfiguration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AspectSemanticTypeConfiguration")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((AspectSemanticTypeConfiguration) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_AspectSemanticTypeConfiguration_type") : //$NON-NLS-1$
-				getString("_UI_AspectSemanticTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		switch (notification.getFeatureID(AspectSemanticTypeConfiguration.class)) {
-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectViewTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectViewTypeConfigurationItemProvider.java
deleted file mode 100644
index ffa9be45482..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/AspectViewTypeConfigurationItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class AspectViewTypeConfigurationItemProvider extends ViewTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public AspectViewTypeConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ExtendedtypesPackage.eINSTANCE.getAspectViewTypeConfiguration_ActionConfiguration());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns AspectViewTypeConfiguration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AspectViewTypeConfiguration")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((AspectViewTypeConfiguration) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_AspectViewTypeConfiguration_type") : //$NON-NLS-1$
-				getString("_UI_AspectViewTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		switch (notification.getFeatureID(AspectViewTypeConfiguration.class)) {
-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ConfigurationElementItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ConfigurationElementItemProvider.java
deleted file mode 100644
index dc4b11a0753..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ConfigurationElementItemProvider.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ConfigurationElementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ConfigurationElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-			addNamePropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-			addIdentifierPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConfigurationElement_name_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_name_feature", "_UI_ConfigurationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExtendedtypesPackage.eINSTANCE.getConfigurationElement_Name(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConfigurationElement_description_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_description_feature", "_UI_ConfigurationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExtendedtypesPackage.eINSTANCE.getConfigurationElement_Description(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Identifier feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addIdentifierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ConfigurationElement_identifier_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_identifier_feature", "_UI_ConfigurationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExtendedtypesPackage.eINSTANCE.getConfigurationElement_Identifier(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ExtendedtypesPackage.eINSTANCE.getConfigurationElement_IconEntry());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ConfigurationElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ConfigurationElement_type") : //$NON-NLS-1$
-				getString("_UI_ConfigurationElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		switch (notification.getFeatureID(ConfigurationElement.class)) {
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-		newChildDescriptors.add(createChildParameter(ExtendedtypesPackage.eINSTANCE.getConfigurationElement_IconEntry(), ExtendedtypesFactory.eINSTANCE.createIconEntry()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ExtendedTypesEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeAdviceConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeAdviceConfigurationItemProvider.java
deleted file mode 100644
index 31dc7db18bd..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeAdviceConfigurationItemProvider.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ElementTypeAdviceConfigurationItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ElementTypeAdviceConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ElementTypeAdviceConfiguration) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ElementTypeAdviceConfiguration_type") : //$NON-NLS-1$
-				getString("_UI_ElementTypeAdviceConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeConfigurationItemProvider.java
deleted file mode 100644
index db0aa0390a1..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ElementTypeConfigurationItemProvider.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ElementTypeConfigurationItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ElementTypeConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-			addHintPropertyDescriptor(object);
-			addKindNamePropertyDescriptor(object);
-			addSpecializedTypesIDPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Hint feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addHintPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementTypeConfiguration_hint_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_hint_feature", "_UI_ElementTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_Hint(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Kind Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addKindNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementTypeConfiguration_kindName_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_kindName_feature", "_UI_ElementTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_KindName(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Specialized Types ID feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addSpecializedTypesIDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ElementTypeConfiguration_specializedTypesID_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_specializedTypesID_feature", "_UI_ElementTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_SpecializedTypesID(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration_MatcherConfiguration());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ElementTypeConfiguration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementTypeConfiguration")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ElementTypeConfiguration) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ElementTypeConfiguration_type") : //$NON-NLS-1$
-				getString("_UI_ElementTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		switch (notification.getFeatureID(ElementTypeConfiguration.class)) {
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java
deleted file mode 100644
index acc93cecf58..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedElementTypeSetItemProvider.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ExtendedElementTypeSetItemProvider extends ConfigurationElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedElementTypeSetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-			addExtensiblePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Extensible feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addExtensiblePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ExtendedElementTypeSet_extensible_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_ExtendedElementTypeSet_extensible_feature", "_UI_ExtendedElementTypeSet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_Extensible(), true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ExtendedElementTypeSet.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExtendedElementTypeSet")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ExtendedElementTypeSet) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ExtendedElementTypeSet_type") : //$NON-NLS-1$
-				getString("_UI_ExtendedElementTypeSet_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		switch (notification.getFeatureID(ExtendedElementTypeSet.class)) {
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-		newChildDescriptors.add(createChildParameter(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType(), ExtendedtypesFactory.eINSTANCE.createAspectSemanticTypeConfiguration()));
-		newChildDescriptors.add(createChildParameter(ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet_ElementType(), ExtendedtypesFactory.eINSTANCE.createAspectViewTypeConfiguration()));
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedTypesEditPlugin.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedTypesEditPlugin.java
deleted file mode 100644
index 3b999d88819..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedTypesEditPlugin.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
-/**
- * This is the central singleton for the ExtendedTypes edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public final class ExtendedTypesEditPlugin extends EMFPlugin {
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final ExtendedTypesEditPlugin INSTANCE = new ExtendedTypesEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedTypesEditPlugin() {
-		super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, });
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java
deleted file mode 100644
index 1ff4931f090..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ExtendedtypesItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.extendedtypes.util.ExtendedtypesAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ExtendedtypesItemProviderAdapterFactory extends ExtendedtypesAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedtypesItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ExtendedElementTypeSetItemProvider extendedElementTypeSetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createExtendedElementTypeSetAdapter() {
-		if (extendedElementTypeSetItemProvider == null) {
-			extendedElementTypeSetItemProvider = new ExtendedElementTypeSetItemProvider(this);
-		}
-		return extendedElementTypeSetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.IconEntry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IconEntryItemProvider iconEntryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.IconEntry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createIconEntryAdapter() {
-		if (iconEntryItemProvider == null) {
-			iconEntryItemProvider = new IconEntryItemProvider(this);
-		}
-		return iconEntryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected AspectSemanticTypeConfigurationItemProvider aspectSemanticTypeConfigurationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createAspectSemanticTypeConfigurationAdapter() {
-		if (aspectSemanticTypeConfigurationItemProvider == null) {
-			aspectSemanticTypeConfigurationItemProvider = new AspectSemanticTypeConfigurationItemProvider(this);
-		}
-		return aspectSemanticTypeConfigurationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected AspectViewTypeConfigurationItemProvider aspectViewTypeConfigurationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createAspectViewTypeConfigurationAdapter() {
-		if (aspectViewTypeConfigurationItemProvider == null) {
-			aspectViewTypeConfigurationItemProvider = new AspectViewTypeConfigurationItemProvider(this);
-		}
-		return aspectViewTypeConfigurationItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void dispose() {
-		if (extendedElementTypeSetItemProvider != null) {
-			extendedElementTypeSetItemProvider.dispose();
-		}
-		if (iconEntryItemProvider != null) {
-			iconEntryItemProvider.dispose();
-		}
-		if (aspectSemanticTypeConfigurationItemProvider != null) {
-			aspectSemanticTypeConfigurationItemProvider.dispose();
-		}
-		if (aspectViewTypeConfigurationItemProvider != null) {
-			aspectViewTypeConfigurationItemProvider.dispose();
-		}
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/IconEntryItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/IconEntryItemProvider.java
deleted file mode 100644
index 211c7369652..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/IconEntryItemProvider.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.IconEntry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class IconEntryItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IconEntryItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-			addIconPathPropertyDescriptor(object);
-			addBundleIdPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Icon Path feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addIconPathPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IconEntry_iconPath_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_IconEntry_iconPath_feature", "_UI_IconEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExtendedtypesPackage.eINSTANCE.getIconEntry_IconPath(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Bundle Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addBundleIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_IconEntry_bundleId_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_IconEntry_bundleId_feature", "_UI_IconEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExtendedtypesPackage.eINSTANCE.getIconEntry_BundleId(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns IconEntry.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IconEntry")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((IconEntry) object).getIconPath();
-		return label == null || label.length() == 0 ? getString("_UI_IconEntry_type") : //$NON-NLS-1$
-				getString("_UI_IconEntry_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		switch (notification.getFeatureID(IconEntry.class)) {
-		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:
-		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ExtendedTypesEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/MatcherConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/MatcherConfigurationItemProvider.java
deleted file mode 100644
index ea340c5cf84..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/MatcherConfigurationItemProvider.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class MatcherConfigurationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public MatcherConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_MatcherConfiguration_type"); //$NON-NLS-1$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ExtendedTypesEditPlugin.INSTANCE;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticActionConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticActionConfigurationItemProvider.java
deleted file mode 100644
index ae37f4bdb8e..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticActionConfigurationItemProvider.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class SemanticActionConfigurationItemProvider extends ActionConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public SemanticActionConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((SemanticActionConfiguration) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_SemanticActionConfiguration_type") : //$NON-NLS-1$
-				getString("_UI_SemanticActionConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticTypeConfigurationItemProvider.java
deleted file mode 100644
index 60498edc643..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/SemanticTypeConfigurationItemProvider.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class SemanticTypeConfigurationItemProvider extends ElementTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public SemanticTypeConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((SemanticTypeConfiguration) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_SemanticTypeConfiguration_type") : //$NON-NLS-1$
-				getString("_UI_SemanticTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewActionConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewActionConfigurationItemProvider.java
deleted file mode 100644
index 17b50010d24..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewActionConfigurationItemProvider.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ViewActionConfigurationItemProvider extends ActionConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ViewActionConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ViewActionConfiguration) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ViewActionConfiguration_type") : //$NON-NLS-1$
-				getString("_UI_ViewActionConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewTypeConfigurationItemProvider.java
deleted file mode 100644
index d5c139cba22..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen/org/eclipse/papyrus/infra/extendedtypes/provider/ViewTypeConfigurationItemProvider.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ViewTypeConfigurationItemProvider extends ElementTypeConfigurationItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ViewTypeConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-			addSpecializedDiagramTypeIDPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Specialized Diagram Type ID feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addSpecializedDiagramTypeIDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ViewTypeConfiguration_specializedDiagramTypeID_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_ViewTypeConfiguration_specializedDiagramTypeID_feature", "_UI_ViewTypeConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ExtendedtypesPackage.eINSTANCE.getViewTypeConfiguration_SpecializedDiagramTypeID(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ViewTypeConfiguration) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ViewTypeConfiguration_type") : //$NON-NLS-1$
-				getString("_UI_ViewTypeConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		switch (notification.getFeatureID(ViewTypeConfiguration.class)) {
-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProvider.java
deleted file mode 100644
index f4c8e765c23..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- *
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.papyrus.infra.extendedtypes.Activator;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantConfigurationModelCreation;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantRuleExtensionPoint;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-import org.osgi.framework.Bundle;
-
-/**
- * Specific Item provider for {@link InvariantSemanticTypeConfiguration} to add new childs given by extension points
- *
- */
-public class CustomInvariantSemanticTypeConfigurationItemProvider extends
-		InvariantSemanticTypeConfigurationItemProvider {
-
-	protected Map<String, IInvariantConfigurationModelCreation<InvariantRuleConfiguration>> configurationToFactory = new HashMap<String, IInvariantConfigurationModelCreation<InvariantRuleConfiguration>>();
-
-	public CustomInvariantSemanticTypeConfigurationItemProvider(
-			AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		// // TODO try to implement this using the extension points => this should
-		// // be added automatically by each extension
-		// newChildDescriptors.add(createChildParameter(
-		// InvariantSemanticTypeConfigurationPackage.eINSTANCE.getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration(),
-		// InvariantContainerConfigurationFactory.eINSTANCE.createInvariantContainerConfiguration()));
-		//
-		addFromExtensionPoints(newChildDescriptors, object);
-
-	}
-
-	/**
-	 * @param newChildDescriptors
-	 * @param object
-	 */
-	protected void addFromExtensionPoints(Collection<Object> newChildDescriptors, Object object) {
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IInvariantRuleExtensionPoint.EXTENSION_POINT_ID);
-		// for each element, parses and retrieve the model file. then loads it and returns the root element
-		for (IConfigurationElement configurationElement : elements) {
-			// contributor will always be the same, but implementation could be different.
-
-
-			String configurationModelCreationClassName = configurationElement.getAttribute(IInvariantRuleExtensionPoint.CONFIGURATION_MODEL_CREATION);
-			if (configurationModelCreationClassName != null) {
-				String contributorName = configurationElement.getContributor().getName();
-				IInvariantConfigurationModelCreation<InvariantRuleConfiguration> configurationModelCreation = configurationToFactory.get(configurationModelCreationClassName);
-				if (configurationModelCreation == null) {
-					Class<IInvariantConfigurationModelCreation<InvariantRuleConfiguration>> configurationClass = null;
-					try {
-						configurationClass = loadInvariantRulecModelCreationClass(configurationModelCreationClassName, contributorName);
-					} catch (ClassNotFoundException e1) {
-						Activator.log.error(e1);
-					}
-					if (configurationClass != null) {
-						// instantiate class
-						try {
-							configurationModelCreation = configurationClass.newInstance();
-							configurationToFactory.put(configurationModelCreationClassName, configurationModelCreation);
-						} catch (InstantiationException e) {
-							Activator.log.error(e);
-						} catch (IllegalAccessException e) {
-							Activator.log.error(e);
-						}
-					}
-				}
-
-				if (configurationModelCreation != null) {
-					newChildDescriptors.add(createChildParameter(
-							InvariantSemanticTypeConfigurationPackage.eINSTANCE.getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration(),
-							configurationModelCreation.createConfigurationModel()));
-
-				}
-			}
-		}
-	}
-
-
-	@SuppressWarnings("unchecked")
-	protected Class<IInvariantConfigurationModelCreation<InvariantRuleConfiguration>> loadInvariantRulecModelCreationClass(String className, String bundleId) throws ClassNotFoundException {
-		Class<IInvariantConfigurationModelCreation<InvariantRuleConfiguration>> found = null;
-		Bundle bundle = basicGetBundle(bundleId);
-		if (bundle != null) {
-			int state = bundle.getState();
-			if (state == org.osgi.framework.Bundle.ACTIVE || state == org.osgi.framework.Bundle.STARTING) {
-				found = (Class<IInvariantConfigurationModelCreation<InvariantRuleConfiguration>>) bundle.loadClass(className);
-				return found;
-			}
-		}
-		return null;
-	}
-
-	private static Bundle basicGetBundle(String bundleId) {
-		return Platform.getBundle(bundleId);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProviderAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProviderAdapterFactory.java
deleted file mode 100644
index 8099a659611..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/provider/CustomInvariantSemanticTypeConfigurationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- *
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-/**
- * @author RS211865
- *
- */
-public class CustomInvariantSemanticTypeConfigurationItemProviderAdapterFactory
-		extends InvariantSemanticTypeConfigurationItemProviderAdapterFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Adapter createInvariantSemanticTypeConfigurationAdapter() {
-		if (invariantSemanticTypeConfigurationItemProvider == null) {
-			invariantSemanticTypeConfigurationItemProvider = new CustomInvariantSemanticTypeConfigurationItemProvider(this);
-		}
-
-		return invariantSemanticTypeConfigurationItemProvider;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomAspectSemanticTypeConfigurationItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomAspectSemanticTypeConfigurationItemProvider.java
deleted file mode 100644
index 61018d32dfc..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomAspectSemanticTypeConfigurationItemProvider.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.Activator;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation;
-import org.eclipse.papyrus.infra.extendedtypes.IAspectTypeExtensionPoint;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
-import org.osgi.framework.Bundle;
-
-/**
- * Specific Item provider for {@link InvariantSemanticTypeConfiguration} to add new childs given by extension points
- *
- */
-public class CustomAspectSemanticTypeConfigurationItemProvider extends AspectSemanticTypeConfigurationItemProvider {
-
-	protected Map<String, IActionConfigurationModelCreation<ActionConfiguration>> configurationToFactory = new HashMap<String, IActionConfigurationModelCreation<ActionConfiguration>>();
-
-	public CustomAspectSemanticTypeConfigurationItemProvider(
-			AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		addFromExtensionPoints(newChildDescriptors, object);
-
-	}
-
-	/**
-	 * @param newChildDescriptors
-	 * @param object
-	 */
-	protected void addFromExtensionPoints(Collection<Object> newChildDescriptors, Object object) {
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IAspectTypeExtensionPoint.EXTENSION_POINT_ID);
-		// for each element, parses and retrieve the model file. then loads it and returns the root element
-		for (IConfigurationElement configurationElement : elements) {
-			// contributor will always be the same, but implementation could be different.
-
-
-			String configurationModelCreationClassName = configurationElement.getAttribute(IAspectTypeExtensionPoint.CONFIGURATION_MODEL_CREATION);
-			if (configurationModelCreationClassName != null) {
-				String contributorName = configurationElement.getContributor().getName();
-				IActionConfigurationModelCreation<ActionConfiguration> configurationModelCreation = configurationToFactory.get(configurationModelCreationClassName);
-				if (configurationModelCreation == null) {
-					Class<IActionConfigurationModelCreation<ActionConfiguration>> configurationClass = null;
-					try {
-						configurationClass = loadAspectActionConfigurationModelCreationClass(configurationModelCreationClassName, contributorName);
-					} catch (ClassNotFoundException e1) {
-						Activator.log.error(e1);
-					}
-					if (configurationClass != null) {
-						// instantiate class
-						try {
-							configurationModelCreation = configurationClass.newInstance();
-							configurationToFactory.put(configurationModelCreationClassName, configurationModelCreation);
-						} catch (InstantiationException e) {
-							Activator.log.error(e);
-						} catch (IllegalAccessException e) {
-							Activator.log.error(e);
-						}
-					}
-				}
-
-				if (configurationModelCreation != null) {
-					newChildDescriptors.add(createChildParameter(
-							ExtendedtypesPackage.eINSTANCE.getAspectSemanticTypeConfiguration_ActionConfiguration(),
-							configurationModelCreation.createConfigurationModel()));
-
-				}
-			}
-		}
-	}
-
-
-	@SuppressWarnings("unchecked")
-	protected Class<IActionConfigurationModelCreation<ActionConfiguration>> loadAspectActionConfigurationModelCreationClass(String className, String bundleId) throws ClassNotFoundException {
-		Class<IActionConfigurationModelCreation<ActionConfiguration>> found = null;
-		Bundle bundle = basicGetBundle(bundleId);
-		if (bundle != null) {
-			int state = bundle.getState();
-			if (state == org.osgi.framework.Bundle.ACTIVE || state == org.osgi.framework.Bundle.STARTING) {
-				found = (Class<IActionConfigurationModelCreation<ActionConfiguration>>) bundle.loadClass(className);
-				return found;
-			}
-		}
-		return null;
-	}
-
-	private static Bundle basicGetBundle(String bundleId) {
-		return Platform.getBundle(bundleId);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedElementTypeSetItemProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedElementTypeSetItemProvider.java
deleted file mode 100644
index eada8b7d3fe..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedElementTypeSetItemProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet} object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class CustomExtendedElementTypeSetItemProvider extends
-		ExtendedElementTypeSetItemProvider {
-	/**
-	 * This constructs an instance from a factory and a notifier. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public CustomExtendedElementTypeSetItemProvider(
-			AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		// TODO try to implement this using the extension points => this should
-		// be added automatically by each extension
-
-		newChildDescriptors.add(createChildParameter(
-				ExtendedtypesPackage.eINSTANCE
-						.getExtendedElementTypeSet_ElementType(),
-				InvariantSemanticTypeConfigurationFactory.eINSTANCE
-						.createInvariantSemanticTypeConfiguration()));
-
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedtypesItemProviderAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedtypesItemProviderAdapterFactory.java
deleted file mode 100644
index 16652b06833..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.edit/src/org/eclipse/papyrus/infra/extendedtypes/provider/CustomExtendedtypesItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * Viewers. The adapters generated by this factory convert EMF adapter
- * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The
- * adapters also support Eclipse property sheets. Note that most of the adapters
- * are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class CustomExtendedtypesItemProviderAdapterFactory extends
-		ExtendedtypesItemProviderAdapterFactory {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Adapter createExtendedElementTypeSetAdapter() {
-		if (extendedElementTypeSetItemProvider == null) {
-			extendedElementTypeSetItemProvider = new CustomExtendedElementTypeSetItemProvider(this);
-		}
-
-		return extendedElementTypeSetItemProvider;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Adapter createAspectSemanticTypeConfigurationAdapter() {
-		if (aspectSemanticTypeConfigurationItemProvider == null) {
-			aspectSemanticTypeConfigurationItemProvider = new CustomAspectSemanticTypeConfigurationItemProvider(this);
-		}
-		return aspectSemanticTypeConfigurationItemProvider;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.classpath b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.classpath
deleted file mode 100644
index 240e23bfdc0..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.project
deleted file mode 100644
index d504a4a6386..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.extendedtypes.editor</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c585cc455ae..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.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/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index aab5cb673f9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.extendedtypes.presentation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.presentation.ExtendedTypesEditorPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/about.html b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/about.html
deleted file mode 100755
index d194d3dce4d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/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>March, 2014</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/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/build.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/build.properties
deleted file mode 100644
index ed6ddf0dd30..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2013 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:
-#  CEA LIST - Initial API and implementation
-
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
-jars.compile.order = .
-source.. = src-gen/,\
-           src/
-output.. = bin
-src.includes = about.html
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/AspectSemanticModelFile.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/AspectSemanticModelFile.gif
deleted file mode 100644
index cc04daea0fe..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/AspectSemanticModelFile.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/ExtendedtypesModelFile.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/ExtendedtypesModelFile.gif
deleted file mode 100644
index 66b71ecf1b9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/ExtendedtypesModelFile.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantHierarchyConfigurationModelFile.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantHierarchyConfigurationModelFile.gif
deleted file mode 100644
index 97061e34e9b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantHierarchyConfigurationModelFile.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantSemanticTypeConfigurationModelFile.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantSemanticTypeConfigurationModelFile.gif
deleted file mode 100644
index b7c1ce53490..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/obj16/InvariantSemanticTypeConfigurationModelFile.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewAspectSemantic.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewAspectSemantic.gif
deleted file mode 100644
index 7238879695e..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewAspectSemantic.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewExtendedtypes.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewExtendedtypes.gif
deleted file mode 100644
index 35743ceb88a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewExtendedtypes.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantHierarchyConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantHierarchyConfiguration.gif
deleted file mode 100644
index 9c44c4935ea..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantHierarchyConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantSemanticTypeConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantSemanticTypeConfiguration.gif
deleted file mode 100644
index 84d170d6289..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/icons/full/wizban/NewInvariantSemanticTypeConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties
deleted file mode 100644
index 220cf347ea6..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.properties
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) 2013, 2014 CEA LIST 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:
-#  CEA LIST - Initial API and implementation
-#  Christian W. Damus (CEA) - fix providerName
-#
-
-pluginName = ExtendedTypes Editor
-providerName = Eclipse Modeling Project
-
-_UI_ExtendedtypesEditor_menu = &Extendedtypes Editor
-
-_UI_CreateChild_menu_item = &New Child
-_UI_CreateSibling_menu_item = N&ew Sibling
-
-_UI_ShowPropertiesView_menu_item = Show &Properties View
-_UI_RefreshViewer_menu_item = &Refresh
-
-_UI_SelectionPage_label = Selection
-_UI_ParentPage_label = Parent
-_UI_ListPage_label = List
-_UI_TreePage_label = Tree
-_UI_TablePage_label = Table
-_UI_TreeWithColumnsPage_label = Tree with Columns
-_UI_ObjectColumn_label = Object
-_UI_SelfColumn_label = Self
-
-_UI_NoObjectSelected = Selected Nothing
-_UI_SingleObjectSelected = Selected Object: {0}
-_UI_MultiObjectSelected = Selected {0} Objects
-
-_UI_OpenEditorError_label = Open Editor
-
-_UI_Wizard_category = Example EMF Model Creation Wizards
-
-_UI_CreateModelError_message = Problems encountered in file "{0}"
-
-_UI_ExtendedtypesModelWizard_label = Extendedtypes Model
-_UI_ExtendedtypesModelWizard_description = Create a new Extendedtypes model
-
-_UI_ExtendedtypesEditor_label = Extendedtypes Model Editor
-
-_UI_ExtendedtypesEditorFilenameDefaultBase = My
-_UI_ExtendedtypesEditorFilenameExtensions = extendedtypes
-
-_UI_Wizard_label = New
-
-_WARN_FilenameExtension = The file name must end in ''.{0}''
-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
-
-_UI_ModelObject = &Model Object
-_UI_XMLEncoding = &XML Encoding
-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
-_UI_Wizard_initial_object_description = Select a model object to create
-
-_UI_FileConflict_label = File Conflict
-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
-
-_UI_AspectSemanticEditor_menu = &AspectSemantic Editor
-
_UI_AspectSemanticModelWizard_label = AspectSemantic Model
-_UI_AspectSemanticModelWizard_description = Create a new AspectSemantic model
-
_UI_AspectSemanticEditor_label = AspectSemantic Model Editor
-
_UI_AspectSemanticEditorFilenameDefaultBase = My
-_UI_AspectSemanticEditorFilenameExtensions = aspectsemantic
-
-_UI_InvariantSemanticTypeConfigurationEditor_menu = &InvariantSemanticTypeConfiguration Editor
-
_UI_InvariantSemanticTypeConfigurationModelWizard_label = InvariantSemanticTypeConfiguration Model
-_UI_InvariantSemanticTypeConfigurationModelWizard_description = Create a new InvariantSemanticTypeConfiguration model
-
_UI_InvariantSemanticTypeConfigurationEditor_label = InvariantSemanticTypeConfiguration Model Editor
-
_UI_InvariantSemanticTypeConfigurationEditorFilenameDefaultBase = My
-_UI_InvariantSemanticTypeConfigurationEditorFilenameExtensions = invariantsemantictypeconfiguration
-
-_UI_InvariantHierarchyConfigurationEditor_menu = &InvariantHierarchyConfiguration Editor
-
_UI_InvariantHierarchyConfigurationModelWizard_label = InvariantHierarchyConfiguration Model
-_UI_InvariantHierarchyConfigurationModelWizard_description = Create a new InvariantHierarchyConfiguration model
-
_UI_InvariantHierarchyConfigurationEditor_label = InvariantHierarchyConfiguration Model Editor
-
_UI_InvariantHierarchyConfigurationEditorFilenameDefaultBase = My
-_UI_InvariantHierarchyConfigurationEditorFilenameExtensions = invarianthierarchyconfiguration
-
-_UI_InvarianthierarchyconfigurationEditor_menu = &Invarianthierarchyconfiguration Editor
-
_UI_InvarianthierarchyconfigurationModelWizard_label = Invarianthierarchyconfiguration Model
-_UI_InvarianthierarchyconfigurationModelWizard_description = Create a new Invarianthierarchyconfiguration model
-
_UI_InvarianthierarchyconfigurationEditor_label = Invarianthierarchyconfiguration Model Editor
-
_UI_InvarianthierarchyconfigurationEditorFilenameDefaultBase = My
-_UI_InvarianthierarchyconfigurationEditorFilenameExtensions = invarianthierarchyconfiguration
-
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.xml
deleted file mode 100644
index a8c24eff582..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/plugin.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright (c) 2013 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:
-  CEA LIST - Initial API and implementation
--->
-
-<plugin>
-
-   <extension point="org.eclipse.ui.newWizards">
-      <!-- @generated ExtendedTypes -->
-      <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
-            name="%_UI_Wizard_category"/>
-      <wizard
-            id="org.eclipse.papyrus.infra.extendedtypes.presentation.ExtendedtypesModelWizardID"
-            name="%_UI_ExtendedtypesModelWizard_label"
-            class="org.eclipse.papyrus.infra.extendedtypes.presentation.ExtendedtypesModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
-            icon="icons/full/obj16/ExtendedtypesModelFile.gif">
-         <description>%_UI_ExtendedtypesModelWizard_description</description>
-         <selection class="org.eclipse.core.resources.IResource"/>
-      </wizard>
-   </extension>
-
-   <extension point="org.eclipse.ui.editors">
-      <!-- @generated InvariantSemanticTypeConfiguration -->
-      <editor
-            id="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.presentation.InvariantSemanticTypeConfigurationEditorID"
-            name="%_UI_InvariantSemanticTypeConfigurationEditor_label"
-            icon="icons/full/obj16/InvariantSemanticTypeConfigurationModelFile.gif"
-            extensions="invariantsemantictypeconfiguration"
-            class="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.presentation.InvariantSemanticTypeConfigurationEditor"
-            contributorClass="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.presentation.InvariantSemanticTypeConfigurationActionBarContributor">
-      </editor>
-   </extension>
-
-
-   <extension point="org.eclipse.ui.editors">
-      <!-- @generated NOT Custom ExtendedTypes -->
-      <editor
-            id="org.eclipse.papyrus.infra.extendedtypes.presentation.ExtendedtypesEditorID"
-            name="%_UI_ExtendedtypesEditor_label"
-            icon="icons/full/obj16/ExtendedtypesModelFile.gif"
-            extensions="extendedtypes"
-            class="org.eclipse.papyrus.infra.extendedtypes.presentation.CustomExtendedtypesEditor"
-            contributorClass="org.eclipse.papyrus.infra.extendedtypes.presentation.ExtendedtypesActionBarContributor">
-      </editor>
-   </extension>
-
-</plugin>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedTypesEditorPlugin.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedTypesEditorPlugin.java
deleted file mode 100644
index 118060c7cd4..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedTypesEditorPlugin.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.presentation;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.ui.EclipseUIPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
-/**
- * This is the central singleton for the ExtendedTypes editor plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public final class ExtendedTypesEditorPlugin extends EMFPlugin {
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final ExtendedTypesEditorPlugin INSTANCE = new ExtendedTypesEditorPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedTypesEditorPlugin() {
-		super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, });
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static class Implementation extends EclipseUIPlugin {
-
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesActionBarContributor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesActionBarContributor.java
deleted file mode 100644
index 50c9b0ba882..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesActionBarContributor.java
+++ /dev/null
@@ -1,535 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.presentation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.ControlAction;
-import org.eclipse.emf.edit.ui.action.CreateChildAction;
-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.action.LoadResourceAction;
-import org.eclipse.emf.edit.ui.action.ValidateAction;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.SubContributionItem;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-/**
- * This is the action bar contributor for the Extendedtypes model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ExtendedtypesActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener {
-
-	/**
-	 * This keeps track of the active editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IEditorPart activeEditorPart;
-
-	/**
-	 * This keeps track of the current selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ISelectionProvider selectionProvider;
-
-	/**
-	 * This action opens the Properties view.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IAction showPropertiesViewAction = new Action(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
-	{
-
-		@Override
-		public void run() {
-			try {
-				getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
-			} catch (PartInitException exception) {
-				ExtendedTypesEditorPlugin.INSTANCE.log(exception);
-			}
-		}
-	};
-
-	/**
-	 * This action refreshes the viewer of the current editor if the editor
-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IAction refreshViewerAction = new Action(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
-	{
-
-		@Override
-		public boolean isEnabled() {
-			return activeEditorPart instanceof IViewerProvider;
-		}
-
-		@Override
-		public void run() {
-			if (activeEditorPart instanceof IViewerProvider) {
-				Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();
-				if (viewer != null) {
-					viewer.refresh();
-				}
-			}
-		}
-	};
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> createChildActions;
-
-	/**
-	 * This will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateChildAction}s, keyed by sub-menu text.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Map<String, Collection<IAction>> createChildSubmenuActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IMenuManager createChildMenuManager;
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> createSiblingActions;
-
-	/**
-	 * This will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction}s, keyed by submenu text.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Map<String, Collection<IAction>> createSiblingSubmenuActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IMenuManager createSiblingMenuManager;
-
-	/**
-	 * This creates an instance of the contributor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedtypesActionBarContributor() {
-		super(ADDITIONS_LAST_STYLE);
-		loadResourceAction = new LoadResourceAction();
-		validateAction = new ValidateAction();
-		controlAction = new ControlAction();
-	}
-
-	/**
-	 * This adds Separators for editor additions to the tool bar.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator("extendedtypes-settings")); //$NON-NLS-1$
-		toolBarManager.add(new Separator("extendedtypes-additions")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This adds to the menu bar a menu and some separators for editor additions,
-	 * as well as the sub-menus for object creation items.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void contributeToMenu(IMenuManager menuManager) {
-		super.contributeToMenu(menuManager);
-		IMenuManager submenuManager = new MenuManager(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditor_menu"), "org.eclipse.papyrus.infra.extendedtypesMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
-		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
-		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
-		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
-		submenuManager.add(new Separator("additions")); //$NON-NLS-1$
-		submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
-		// Prepare for CreateChild item addition or removal.
-		//
-		createChildMenuManager = new MenuManager(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
-		submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
-		// Prepare for CreateSibling item addition or removal.
-		//
-		createSiblingMenuManager = new MenuManager(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
-		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
-		// Force an update because Eclipse hides empty menus now.
-		//
-		submenuManager.addMenuListener(new IMenuListener() {
-
-			public void menuAboutToShow(IMenuManager menuManager) {
-				menuManager.updateAll(true);
-			}
-		});
-		addGlobalActions(submenuManager);
-	}
-
-	/**
-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setActiveEditor(IEditorPart part) {
-		super.setActiveEditor(part);
-		activeEditorPart = part;
-		// Switch to the new selection provider.
-		//
-		if (selectionProvider != null) {
-			selectionProvider.removeSelectionChangedListener(this);
-		}
-		if (part == null) {
-			selectionProvider = null;
-		} else {
-			selectionProvider = part.getSite().getSelectionProvider();
-			selectionProvider.addSelectionChangedListener(this);
-			// Fake a selection changed event to update the menus.
-			//
-			if (selectionProvider.getSelection() != null) {
-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
-			}
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
-	 * that can be added to the selected object and updating the menus accordingly.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		// Remove any menu items for old selection.
-		//
-		if (createChildMenuManager != null) {
-			depopulateManager(createChildMenuManager, createChildSubmenuActions);
-			depopulateManager(createChildMenuManager, createChildActions);
-		}
-		if (createSiblingMenuManager != null) {
-			depopulateManager(createSiblingMenuManager, createSiblingSubmenuActions);
-			depopulateManager(createSiblingMenuManager, createSiblingActions);
-		}
-		// Query the new selection for appropriate new child/sibling descriptors
-		//
-		Collection<?> newChildDescriptors = null;
-		Collection<?> newSiblingDescriptors = null;
-		ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {
-			Object object = ((IStructuredSelection) selection).getFirstElement();
-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();
-			newChildDescriptors = domain.getNewChildDescriptors(object, null);
-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
-		}
-		// Generate actions for selection; populate and redraw the menus.
-		//
-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
-		createChildSubmenuActions = extractSubmenuActions(createChildActions);
-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
-		createSiblingSubmenuActions = extractSubmenuActions(createSiblingActions);
-		if (createChildMenuManager != null) {
-			populateManager(createChildMenuManager, createChildSubmenuActions, null);
-			populateManager(createChildMenuManager, createChildActions, null);
-			createChildMenuManager.update(true);
-		}
-		if (createSiblingMenuManager != null) {
-			populateManager(createSiblingMenuManager, createSiblingSubmenuActions, null);
-			populateManager(createSiblingMenuManager, createSiblingActions, null);
-			createSiblingMenuManager.update(true);
-		}
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
-	 * by inserting them before the specified contribution item <code>contributionID</code>.
-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
-		if (actions != null) {
-			for (IAction action : actions) {
-				if (contributionID != null) {
-					manager.insertBefore(contributionID, action);
-				} else {
-					manager.add(action);
-				}
-			}
-		}
-	}
-
-	/**
-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
-		if (actions != null) {
-			IContributionItem[] items = manager.getItems();
-			for (int i = 0; i < items.length; i++) {
-				// Look into SubContributionItems
-				//
-				IContributionItem contributionItem = items[i];
-				while (contributionItem instanceof SubContributionItem) {
-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();
-				}
-				// Delete the ActionContributionItems with matching action.
-				//
-				if (contributionItem instanceof ActionContributionItem) {
-					IAction action = ((ActionContributionItem) contributionItem).getAction();
-					if (actions.contains(action)) {
-						manager.remove(contributionItem);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This extracts those actions in the <code>submenuActions</code> collection whose text is qualified and returns
-	 * a map of these actions, keyed by submenu text.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Map<String, Collection<IAction>> extractSubmenuActions(Collection<IAction> createActions) {
-		Map<String, Collection<IAction>> createSubmenuActions = new LinkedHashMap<String, Collection<IAction>>();
-		if (createActions != null) {
-			for (Iterator<IAction> actions = createActions.iterator(); actions.hasNext();) {
-				IAction action = actions.next();
-				StringTokenizer st = new StringTokenizer(action.getText(), "|"); //$NON-NLS-1$
-				if (st.countTokens() == 2) {
-					String text = st.nextToken().trim();
-					Collection<IAction> submenuActions = createSubmenuActions.get(text);
-					if (submenuActions == null) {
-						createSubmenuActions.put(text, submenuActions = new ArrayList<IAction>());
-					}
-					action.setText(st.nextToken().trim());
-					submenuActions.add(action);
-					actions.remove();
-				}
-			}
-		}
-		return createSubmenuActions;
-	}
-
-	/**
-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.MenuManager}s containing {@link org.eclipse.jface.action.ActionContributionItem}s based on the {@link org.eclipse.jface.action.IAction}s
-	 * contained in the <code>submenuActions</code> collection, by inserting them before the specified contribution
-	 * item <code>contributionID</code>.
-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void populateManager(IContributionManager manager, Map<String, Collection<IAction>> submenuActions, String contributionID) {
-		if (submenuActions != null) {
-			for (Map.Entry<String, Collection<IAction>> entry : submenuActions.entrySet()) {
-				MenuManager submenuManager = new MenuManager(entry.getKey());
-				if (contributionID != null) {
-					manager.insertBefore(contributionID, submenuManager);
-				} else {
-					manager.add(submenuManager);
-				}
-				populateManager(submenuManager, entry.getValue(), null);
-			}
-		}
-	}
-
-	/**
-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.MenuManager}s and their {@link org.eclipse.jface.action.ActionContributionItem}s based on the {@link org.eclipse.jface.action.IAction}s
-	 * contained in the <code>submenuActions</code> map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void depopulateManager(IContributionManager manager, Map<String, Collection<IAction>> submenuActions) {
-		if (submenuActions != null) {
-			IContributionItem[] items = manager.getItems();
-			for (int i = 0; i < items.length; i++) {
-				IContributionItem contributionItem = items[i];
-				if (contributionItem instanceof MenuManager) {
-					MenuManager submenuManager = (MenuManager) contributionItem;
-					if (submenuActions.containsKey(submenuManager.getMenuText())) {
-						depopulateManager(submenuManager, submenuActions.get(contributionItem));
-						manager.remove(contributionItem);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This populates the pop-up menu before it appears.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void menuAboutToShow(IMenuManager menuManager) {
-		super.menuAboutToShow(menuManager);
-		MenuManager submenuManager = null;
-		submenuManager = new MenuManager(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
-		populateManager(submenuManager, createChildSubmenuActions, null);
-		populateManager(submenuManager, createChildActions, null);
-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
-		submenuManager = new MenuManager(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
-		populateManager(submenuManager, createSiblingSubmenuActions, null);
-		populateManager(submenuManager, createSiblingActions, null);
-		menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
-	}
-
-	/**
-	 * This inserts global actions before the "additions-end" separator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void addGlobalActions(IMenuManager menuManager) {
-		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
-		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-		menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
-		super.addGlobalActions(menuManager);
-	}
-
-	/**
-	 * This ensures that a delete action will clean up all references to deleted objects.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected boolean removeAllReferencesOnDelete() {
-		return true;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesEditor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesEditor.java
deleted file mode 100644
index 0fd5c56cde9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesEditor.java
+++ /dev/null
@@ -1,1761 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.presentation;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.ui.MarkerHelper;
-import org.eclipse.emf.common.ui.ViewerPane;
-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
-import org.eclipse.emf.edit.ui.util.EditUIUtil;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedtypesItemProviderAdapterFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheet;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-/**
- * This is an example of a Extendedtypes model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ExtendedtypesEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
-
-	/**
-	 * This keeps track of the editing domain that is used to track all changes to the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected AdapterFactoryEditingDomain editingDomain;
-
-	/**
-	 * This is the one adapter factory used for providing views of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ComposedAdapterFactory adapterFactory;
-
-	/**
-	 * This is the content outline page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IContentOutlinePage contentOutlinePage;
-
-	/**
-	 * This is a kludge...
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IStatusLineManager contentOutlineStatusLineManager;
-
-	/**
-	 * This is the content outline page's viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer contentOutlineViewer;
-
-	/**
-	 * This is the property sheet page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
-
-	/**
-	 * This is the viewer that shadows the selection in the content outline.
-	 * The parent relation must be correctly defined for this to work.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer selectionViewer;
-
-	/**
-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer parentViewer;
-
-	/**
-	 * This shows how a tree view works.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer treeViewer;
-
-	/**
-	 * This shows how a list view works.
-	 * A list viewer doesn't support icons.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ListViewer listViewer;
-
-	/**
-	 * This shows how a table view works.
-	 * A table can be used as a list with icons.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TableViewer tableViewer;
-
-	/**
-	 * This shows how a tree view with columns works.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer treeViewerWithColumns;
-
-	/**
-	 * This keeps track of the active viewer pane, in the book.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ViewerPane currentViewerPane;
-
-	/**
-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Viewer currentViewer;
-
-	/**
-	 * This listens to which ever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ISelectionChangedListener selectionChangedListener;
-
-	/**
-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
-
-	/**
-	 * This keeps track of the selection of the editor as a whole.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ISelection editorSelection = StructuredSelection.EMPTY;
-
-	/**
-	 * The MarkerHelper is responsible for creating workspace resource markers presented
-	 * in Eclipse's Problems View.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
-
-	/**
-	 * This listens for when the outline becomes active
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IPartListener partListener = new IPartListener() {
-
-		public void partActivated(IWorkbenchPart p) {
-			if (p instanceof ContentOutline) {
-				if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
-					getActionBarContributor().setActiveEditor(ExtendedtypesEditor.this);
-					setCurrentViewer(contentOutlineViewer);
-				}
-			} else if (p instanceof PropertySheet) {
-				if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {
-					getActionBarContributor().setActiveEditor(ExtendedtypesEditor.this);
-					handleActivate();
-				}
-			} else if (p == ExtendedtypesEditor.this) {
-				handleActivate();
-			}
-		}
-
-		public void partBroughtToTop(IWorkbenchPart p) {
-			// Ignore.
-		}
-
-		public void partClosed(IWorkbenchPart p) {
-			// Ignore.
-		}
-
-		public void partDeactivated(IWorkbenchPart p) {
-			// Ignore.
-		}
-
-		public void partOpened(IWorkbenchPart p) {
-			// Ignore.
-		}
-	};
-
-	/**
-	 * Resources that have been removed since last activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been changed since last activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been saved.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Resource> savedResources = new ArrayList<Resource>();
-
-	/**
-	 * Map to store the diagnostic associated with a resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
-
-	/**
-	 * Controls whether the problem indication should be updated.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean updateProblemIndication = true;
-
-	/**
-	 * Adapter used to update the problem indication when resources are demanded loaded.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected EContentAdapter problemIndicationAdapter = new EContentAdapter() {
-
-		@Override
-		public void notifyChanged(Notification notification) {
-			if (notification.getNotifier() instanceof Resource) {
-				switch (notification.getFeatureID(Resource.class)) {
-				case Resource.RESOURCE__IS_LOADED:
-				case Resource.RESOURCE__ERRORS:
-				case Resource.RESOURCE__WARNINGS:
-				{
-					Resource resource = (Resource) notification.getNotifier();
-					Diagnostic diagnostic = analyzeResourceProblems(resource, null);
-					if (diagnostic.getSeverity() != Diagnostic.OK) {
-						resourceToDiagnosticMap.put(resource, diagnostic);
-					} else {
-						resourceToDiagnosticMap.remove(resource);
-					}
-					if (updateProblemIndication) {
-						getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
-							public void run() {
-								updateProblemIndication();
-							}
-						});
-					}
-					break;
-				}
-				}
-			} else {
-				super.notifyChanged(notification);
-			}
-		}
-
-		@Override
-		protected void setTarget(Resource target) {
-			basicSetTarget(target);
-		}
-
-		@Override
-		protected void unsetTarget(Resource target) {
-			basicUnsetTarget(target);
-			resourceToDiagnosticMap.remove(target);
-			if (updateProblemIndication) {
-				getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
-					public void run() {
-						updateProblemIndication();
-					}
-				});
-			}
-		}
-	};
-
-	/**
-	 * This listens for workspace changes.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {
-
-		public void resourceChanged(IResourceChangeEvent event) {
-			IResourceDelta delta = event.getDelta();
-			try {
-				class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-
-					protected ResourceSet resourceSet = editingDomain.getResourceSet();
-
-					protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-					protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-					public boolean visit(IResourceDelta delta) {
-						if (delta.getResource().getType() == IResource.FILE) {
-							if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
-								Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
-								if (resource != null) {
-									if (delta.getKind() == IResourceDelta.REMOVED) {
-										removedResources.add(resource);
-									} else if (!savedResources.remove(resource)) {
-										changedResources.add(resource);
-									}
-								}
-							}
-							return false;
-						}
-						return true;
-					}
-
-					public Collection<Resource> getChangedResources() {
-						return changedResources;
-					}
-
-					public Collection<Resource> getRemovedResources() {
-						return removedResources;
-					}
-				}
-				final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-				delta.accept(visitor);
-				if (!visitor.getRemovedResources().isEmpty()) {
-					getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
-						public void run() {
-							removedResources.addAll(visitor.getRemovedResources());
-							if (!isDirty()) {
-								getSite().getPage().closeEditor(ExtendedtypesEditor.this, false);
-							}
-						}
-					});
-				}
-				if (!visitor.getChangedResources().isEmpty()) {
-					getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
-						public void run() {
-							changedResources.addAll(visitor.getChangedResources());
-							if (getSite().getPage().getActiveEditor() == ExtendedtypesEditor.this) {
-								handleActivate();
-							}
-						}
-					});
-				}
-			} catch (CoreException exception) {
-				ExtendedTypesEditorPlugin.INSTANCE.log(exception);
-			}
-		}
-	};
-
-	/**
-	 * Handles activation of the editor or it's associated views.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void handleActivate() {
-		// Recompute the read only state.
-		//
-		if (editingDomain.getResourceToReadOnlyMap() != null) {
-			editingDomain.getResourceToReadOnlyMap().clear();
-			// Refresh any actions that may become enabled or disabled.
-			//
-			setSelection(getSelection());
-		}
-		if (!removedResources.isEmpty()) {
-			if (handleDirtyConflict()) {
-				getSite().getPage().closeEditor(ExtendedtypesEditor.this, false);
-			} else {
-				removedResources.clear();
-				changedResources.clear();
-				savedResources.clear();
-			}
-		} else if (!changedResources.isEmpty()) {
-			changedResources.removeAll(savedResources);
-			handleChangedResources();
-			changedResources.clear();
-			savedResources.clear();
-		}
-	}
-
-	/**
-	 * Handles what to do with changed resources on activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void handleChangedResources() {
-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
-			if (isDirty()) {
-				changedResources.addAll(editingDomain.getResourceSet().getResources());
-			}
-			editingDomain.getCommandStack().flush();
-			updateProblemIndication = false;
-			for (Resource resource : changedResources) {
-				if (resource.isLoaded()) {
-					resource.unload();
-					try {
-						resource.load(Collections.EMPTY_MAP);
-					} catch (IOException exception) {
-						if (!resourceToDiagnosticMap.containsKey(resource)) {
-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-						}
-					}
-				}
-			}
-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
-				setSelection(StructuredSelection.EMPTY);
-			}
-			updateProblemIndication = true;
-			updateProblemIndication();
-		}
-	}
-
-	/**
-	 * Updates the problems indication with the information described in the specified diagnostic.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void updateProblemIndication() {
-		if (updateProblemIndication) {
-			BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.papyrus.infra.extendedtypes.editor", //$NON-NLS-1$
-					0, null, new Object[] { editingDomain.getResourceSet() });
-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
-					diagnostic.add(childDiagnostic);
-				}
-			}
-			int lastEditorPage = getPageCount() - 1;
-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					setActivePage(lastEditorPage);
-				}
-			} else if (diagnostic.getSeverity() != Diagnostic.OK) {
-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
-				problemEditorPart.setDiagnostic(diagnostic);
-				problemEditorPart.setMarkerHelper(markerHelper);
-				try {
-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
-					setPageText(lastEditorPage, problemEditorPart.getPartName());
-					setActivePage(lastEditorPage);
-					showTabs();
-				} catch (PartInitException exception) {
-					ExtendedTypesEditorPlugin.INSTANCE.log(exception);
-				}
-			}
-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
-				markerHelper.deleteMarkers(editingDomain.getResourceSet());
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					try {
-						markerHelper.createMarkers(diagnostic);
-					} catch (CoreException exception) {
-						ExtendedTypesEditorPlugin.INSTANCE.log(exception);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Shows a dialog that asks if conflicting changes should be discarded.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean handleDirtyConflict() {
-		return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), //$NON-NLS-1$
-				getString("_WARN_FileConflict")); //$NON-NLS-1$
-	}
-
-	/**
-	 * This creates a model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedtypesEditor() {
-		super();
-		initializeEditingDomain();
-	}
-
-	/**
-	 * This sets up the editing domain for the model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void initializeEditingDomain() {
-		// Create an adapter factory that yields item providers.
-		//
-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new ExtendedtypesItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-		// Create the command stack that will notify this editor as commands are executed.
-		//
-		BasicCommandStack commandStack = new BasicCommandStack();
-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
-		//
-		commandStack.addCommandStackListener(new CommandStackListener() {
-
-			public void commandStackChanged(final EventObject event) {
-				getContainer().getDisplay().asyncExec(new Runnable() {
-
-					public void run() {
-						firePropertyChange(IEditorPart.PROP_DIRTY);
-						// Try to select the affected objects.
-						//
-						Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();
-						if (mostRecentCommand != null) {
-							setSelectionToViewer(mostRecentCommand.getAffectedObjects());
-						}
-						for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {
-							PropertySheetPage propertySheetPage = i.next();
-							if (propertySheetPage.getControl().isDisposed()) {
-								i.remove();
-							} else {
-								propertySheetPage.refresh();
-							}
-						}
-					}
-				});
-			}
-		});
-		// Create the editing domain with a special command stack.
-		//
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
-	}
-
-	/**
-	 * This is here for the listener to be able to call it.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void firePropertyChange(int action) {
-		super.firePropertyChange(action);
-	}
-
-	/**
-	 * This sets the selection into whichever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setSelectionToViewer(Collection<?> collection) {
-		final Collection<?> theSelection = collection;
-		// Make sure it's okay.
-		//
-		if (theSelection != null && !theSelection.isEmpty()) {
-			Runnable runnable = new Runnable() {
-
-				public void run() {
-					// Try to select the items in the current content viewer of the editor.
-					//
-					if (currentViewer != null) {
-						currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
-					}
-				}
-			};
-			getSite().getShell().getDisplay().asyncExec(runnable);
-		}
-	}
-
-	/**
-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
-			super(adapterFactory);
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public Object[] getElements(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public Object[] getChildren(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public boolean hasChildren(Object object) {
-			Object parent = super.getParent(object);
-			return parent != null;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public Object getParent(Object object) {
-			return null;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setCurrentViewerPane(ViewerPane viewerPane) {
-		if (currentViewerPane != viewerPane) {
-			if (currentViewerPane != null) {
-				currentViewerPane.showFocus(false);
-			}
-			currentViewerPane = viewerPane;
-		}
-		setCurrentViewer(currentViewerPane.getViewer());
-	}
-
-	/**
-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
-	 * is the current one.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setCurrentViewer(Viewer viewer) {
-		// If it is changing...
-		//
-		if (currentViewer != viewer) {
-			if (selectionChangedListener == null) {
-				// Create the listener on demand.
-				//
-				selectionChangedListener = new ISelectionChangedListener() {
-
-					// This just notifies those things that are affected by the section.
-					//
-					public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
-						setSelection(selectionChangedEvent.getSelection());
-					}
-				};
-			}
-			// Stop listening to the old one.
-			//
-			if (currentViewer != null) {
-				currentViewer.removeSelectionChangedListener(selectionChangedListener);
-			}
-			// Start listening to the new one.
-			//
-			if (viewer != null) {
-				viewer.addSelectionChangedListener(selectionChangedListener);
-			}
-			// Remember it.
-			//
-			currentViewer = viewer;
-			// Set the editors selection based on the current viewer's selection.
-			//
-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
-		}
-	}
-
-	/**
-	 * This returns the viewer as required by the {@link IViewerProvider} interface.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public Viewer getViewer() {
-		return currentViewer;
-	}
-
-	/**
-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void createContextMenuFor(StructuredViewer viewer) {
-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
-		contextMenu.setRemoveAllWhenShown(true);
-		contextMenu.addMenuListener(this);
-		Menu menu = contextMenu.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
-	}
-
-	/**
-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void createModel() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
-		Exception exception = null;
-		Resource resource = null;
-		try {
-			// Load the resource through the editing domain.
-			//
-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
-		} catch (Exception e) {
-			exception = e;
-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
-		}
-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-		if (diagnostic.getSeverity() != Diagnostic.OK) {
-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-		}
-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
-	}
-
-	/**
-	 * Returns a diagnostic describing the errors and warnings listed in the resource
-	 * and the specified exception (if any).
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
-			BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.extendedtypes.editor", //$NON-NLS-1$
-					0, getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
-					new Object[] { exception == null ? (Object) resource : exception });
-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
-			return basicDiagnostic;
-		} else if (exception != null) {
-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.extendedtypes.editor", //$NON-NLS-1$
-					0, getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
-					new Object[] { exception });
-		} else {
-			return Diagnostic.OK_INSTANCE;
-		}
-	}
-
-	/**
-	 * This is the method used by the framework to install your own controls.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void createPages() {
-		// Creates the model from the editor input
-		//
-		createModel();
-		// Only creates the other pages if there is something that can be edited
-		//
-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
-			// Create a page for the selection tree view.
-			//
-			{
-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.this) {
-
-					@Override
-					public Viewer createViewer(Composite composite) {
-						Tree tree = new Tree(composite, SWT.MULTI);
-						TreeViewer newTreeViewer = new TreeViewer(tree);
-						return newTreeViewer;
-					}
-
-					@Override
-					public void requestActivation() {
-						super.requestActivation();
-						setCurrentViewerPane(this);
-					}
-				};
-				viewerPane.createControl(getContainer());
-				selectionViewer = (TreeViewer) viewerPane.getViewer();
-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				selectionViewer.setInput(editingDomain.getResourceSet());
-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-				viewerPane.setTitle(editingDomain.getResourceSet());
-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
-				createContextMenuFor(selectionViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
-			}
-			// Create a page for the parent tree view.
-			//
-			{
-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.this) {
-
-					@Override
-					public Viewer createViewer(Composite composite) {
-						Tree tree = new Tree(composite, SWT.MULTI);
-						TreeViewer newTreeViewer = new TreeViewer(tree);
-						return newTreeViewer;
-					}
-
-					@Override
-					public void requestActivation() {
-						super.requestActivation();
-						setCurrentViewerPane(this);
-					}
-				};
-				viewerPane.createControl(getContainer());
-				parentViewer = (TreeViewer) viewerPane.getViewer();
-				parentViewer.setAutoExpandLevel(30);
-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				createContextMenuFor(parentViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
-			}
-			// This is the page for the list viewer
-			//
-			{
-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.this) {
-
-					@Override
-					public Viewer createViewer(Composite composite) {
-						return new ListViewer(composite);
-					}
-
-					@Override
-					public void requestActivation() {
-						super.requestActivation();
-						setCurrentViewerPane(this);
-					}
-				};
-				viewerPane.createControl(getContainer());
-				listViewer = (ListViewer) viewerPane.getViewer();
-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				createContextMenuFor(listViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
-			}
-			// This is the page for the tree viewer
-			//
-			{
-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.this) {
-
-					@Override
-					public Viewer createViewer(Composite composite) {
-						return new TreeViewer(composite);
-					}
-
-					@Override
-					public void requestActivation() {
-						super.requestActivation();
-						setCurrentViewerPane(this);
-					}
-				};
-				viewerPane.createControl(getContainer());
-				treeViewer = (TreeViewer) viewerPane.getViewer();
-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
-				createContextMenuFor(treeViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
-			}
-			// This is the page for the table viewer.
-			//
-			{
-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.this) {
-
-					@Override
-					public Viewer createViewer(Composite composite) {
-						return new TableViewer(composite);
-					}
-
-					@Override
-					public void requestActivation() {
-						super.requestActivation();
-						setCurrentViewerPane(this);
-					}
-				};
-				viewerPane.createControl(getContainer());
-				tableViewer = (TableViewer) viewerPane.getViewer();
-				Table table = tableViewer.getTable();
-				TableLayout layout = new TableLayout();
-				table.setLayout(layout);
-				table.setHeaderVisible(true);
-				table.setLinesVisible(true);
-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
-				layout.addColumnData(new ColumnWeightData(3, 100, true));
-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
-				objectColumn.setResizable(true);
-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
-				layout.addColumnData(new ColumnWeightData(2, 100, true));
-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
-				selfColumn.setResizable(true);
-				tableViewer.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$
-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				createContextMenuFor(tableViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
-			}
-			// This is the page for the table tree viewer.
-			//
-			{
-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ExtendedtypesEditor.this) {
-
-					@Override
-					public Viewer createViewer(Composite composite) {
-						return new TreeViewer(composite);
-					}
-
-					@Override
-					public void requestActivation() {
-						super.requestActivation();
-						setCurrentViewerPane(this);
-					}
-				};
-				viewerPane.createControl(getContainer());
-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();
-				Tree tree = treeViewerWithColumns.getTree();
-				tree.setLayoutData(new FillLayout());
-				tree.setHeaderVisible(true);
-				tree.setLinesVisible(true);
-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
-				objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
-				objectColumn.setResizable(true);
-				objectColumn.setWidth(250);
-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
-				selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
-				selfColumn.setResizable(true);
-				selfColumn.setWidth(200);
-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$
-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				createContextMenuFor(treeViewerWithColumns);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
-			}
-			getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
-				public void run() {
-					setActivePage(0);
-				}
-			});
-		}
-		// Ensures that this editor will only display the page's tab
-		// area if there are more than one page
-		//
-		getContainer().addControlListener(new ControlAdapter() {
-
-			boolean guard = false;
-
-			@Override
-			public void controlResized(ControlEvent event) {
-				if (!guard) {
-					guard = true;
-					hideTabs();
-					guard = false;
-				}
-			}
-		});
-		getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
-			public void run() {
-				updateProblemIndication();
-			}
-		});
-	}
-
-	/**
-	 * If there is just one page in the multi-page editor part,
-	 * this hides the single tab at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void hideTabs() {
-		if (getPageCount() <= 1) {
-			setPageText(0, ""); //$NON-NLS-1$
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder) getContainer()).setTabHeight(1);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y + 6);
-			}
-		}
-	}
-
-	/**
-	 * If there is more than one page in the multi-page editor part,
-	 * this shows the tabs at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void showTabs() {
-		if (getPageCount() > 1) {
-			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y - 6);
-			}
-		}
-	}
-
-	/**
-	 * This is used to track the active viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void pageChange(int pageIndex) {
-		super.pageChange(pageIndex);
-		if (contentOutlinePage != null) {
-			handleContentOutlineSelection(contentOutlinePage.getSelection());
-		}
-	}
-
-	/**
-	 * This is how the framework determines which interfaces we implement.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("rawtypes")
-	@Override
-	public Object getAdapter(Class key) {
-		if (key.equals(IContentOutlinePage.class)) {
-			return showOutlineView() ? getContentOutlinePage() : null;
-		} else if (key.equals(IPropertySheetPage.class)) {
-			return getPropertySheetPage();
-		} else if (key.equals(IGotoMarker.class)) {
-			return this;
-		} else {
-			return super.getAdapter(key);
-		}
-	}
-
-	/**
-	 * This accesses a cached version of the content outliner.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IContentOutlinePage getContentOutlinePage() {
-		if (contentOutlinePage == null) {
-			// The content outline is just a tree.
-			//
-			class MyContentOutlinePage extends ContentOutlinePage {
-
-				@Override
-				public void createControl(Composite parent) {
-					super.createControl(parent);
-					contentOutlineViewer = getTreeViewer();
-					contentOutlineViewer.addSelectionChangedListener(this);
-					// Set up the tree viewer.
-					//
-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-					contentOutlineViewer.setInput(editingDomain.getResourceSet());
-					// Make sure our popups work.
-					//
-					createContextMenuFor(contentOutlineViewer);
-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
-						// Select the root object in the view.
-						//
-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-					}
-				}
-
-				@Override
-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
-					super.makeContributions(menuManager, toolBarManager, statusLineManager);
-					contentOutlineStatusLineManager = statusLineManager;
-				}
-
-				@Override
-				public void setActionBars(IActionBars actionBars) {
-					super.setActionBars(actionBars);
-					getActionBarContributor().shareGlobalActions(this, actionBars);
-				}
-			}
-			contentOutlinePage = new MyContentOutlinePage();
-			// Listen to selection so that we can handle it is a special way.
-			//
-			contentOutlinePage.addSelectionChangedListener(new ISelectionChangedListener() {
-
-				// This ensures that we handle selections correctly.
-				//
-				public void selectionChanged(SelectionChangedEvent event) {
-					handleContentOutlineSelection(event.getSelection());
-				}
-			});
-		}
-		return contentOutlinePage;
-	}
-
-	/**
-	 * This accesses a cached version of the property sheet.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IPropertySheetPage getPropertySheetPage() {
-		PropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(editingDomain) {
-
-			@Override
-			public void setSelectionToViewer(List<?> selection) {
-				ExtendedtypesEditor.this.setSelectionToViewer(selection);
-				ExtendedtypesEditor.this.setFocus();
-			}
-
-			@Override
-			public void setActionBars(IActionBars actionBars) {
-				super.setActionBars(actionBars);
-				getActionBarContributor().shareGlobalActions(this, actionBars);
-			}
-		};
-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
-		propertySheetPages.add(propertySheetPage);
-		return propertySheetPage;
-	}
-
-	/**
-	 * This deals with how we want selection in the outliner to affect the other views.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void handleContentOutlineSelection(ISelection selection) {
-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();
-			if (selectedElements.hasNext()) {
-				// Get the first selected element.
-				//
-				Object selectedElement = selectedElements.next();
-				// If it's the selection viewer, then we want it to select the same selection as this selection.
-				//
-				if (currentViewerPane.getViewer() == selectionViewer) {
-					ArrayList<Object> selectionList = new ArrayList<Object>();
-					selectionList.add(selectedElement);
-					while (selectedElements.hasNext()) {
-						selectionList.add(selectedElements.next());
-					}
-					// Set the selection to the widget.
-					//
-					selectionViewer.setSelection(new StructuredSelection(selectionList));
-				} else {
-					// Set the input to the widget.
-					//
-					if (currentViewerPane.getViewer().getInput() != selectedElement) {
-						currentViewerPane.getViewer().setInput(selectedElement);
-						currentViewerPane.setTitle(selectedElement);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isDirty() {
-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply saves the model file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void doSave(IProgressMonitor progressMonitor) {
-		// Save only resources that have actually changed.
-		//
-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
-		// Do the work within an operation because this is a long running activity that modifies the workbench.
-		//
-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-
-			// This is the method that gets invoked when the operation runs.
-			//
-			@Override
-			public void execute(IProgressMonitor monitor) {
-				// Save the resources to the file system.
-				//
-				boolean first = true;
-				for (Resource resource : editingDomain.getResourceSet().getResources()) {
-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
-						try {
-							long timeStamp = resource.getTimeStamp();
-							resource.save(saveOptions);
-							if (resource.getTimeStamp() != timeStamp) {
-								savedResources.add(resource);
-							}
-						} catch (Exception exception) {
-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-						}
-						first = false;
-					}
-				}
-			}
-		};
-		updateProblemIndication = false;
-		try {
-			// This runs the options, and shows progress.
-			//
-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
-			// Refresh the necessary state.
-			//
-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();
-			firePropertyChange(IEditorPart.PROP_DIRTY);
-		} catch (Exception exception) {
-			// Something went wrong that shouldn't.
-			//
-			ExtendedTypesEditorPlugin.INSTANCE.log(exception);
-		}
-		updateProblemIndication = true;
-		updateProblemIndication();
-	}
-
-	/**
-	 * This returns whether something has been persisted to the URI of the specified resource.
-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean isPersisted(Resource resource) {
-		boolean result = false;
-		try {
-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
-			if (stream != null) {
-				result = true;
-				stream.close();
-			}
-		} catch (IOException e) {
-			// Ignore
-		}
-		return result;
-	}
-
-	/**
-	 * This always returns true because it is not currently supported.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * This also changes the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void doSaveAs() {
-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
-		saveAsDialog.open();
-		IPath path = saveAsDialog.getResult();
-		if (path != null) {
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			if (file != null) {
-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
-			}
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void doSaveAs(URI uri, IEditorInput editorInput) {
-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-		doSave(progressMonitor);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void gotoMarker(IMarker marker) {
-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
-		if (!targetObjects.isEmpty()) {
-			setSelectionToViewer(targetObjects);
-		}
-	}
-
-	/**
-	 * This is called during startup.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput editorInput) {
-		setSite(site);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		site.setSelectionProvider(this);
-		site.getPage().addPartListener(partListener);
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setFocus() {
-		if (currentViewerPane != null) {
-			currentViewerPane.setFocus();
-		} else {
-			getControl(getActivePage()).setFocus();
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.add(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ISelection getSelection() {
-		return editorSelection;
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
-	 * Calling this result will notify the listeners.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setSelection(ISelection selection) {
-		editorSelection = selection;
-		for (ISelectionChangedListener listener : selectionChangedListeners) {
-			listener.selectionChanged(new SelectionChangedEvent(this, selection));
-		}
-		setStatusLineManager(selection);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setStatusLineManager(ISelection selection) {
-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
-		if (statusLineManager != null) {
-			if (selection instanceof IStructuredSelection) {
-				Collection<?> collection = ((IStructuredSelection) selection).toList();
-				switch (collection.size()) {
-				case 0: {
-					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
-					break;
-				}
-				case 1: {
-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
-					break;
-				}
-				default: {
-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
-					break;
-				}
-				}
-			} else {
-				statusLineManager.setMessage(""); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * This looks up a string in the plugin's plugin.properties file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static String getString(String key) {
-		return ExtendedTypesEditorPlugin.INSTANCE.getString(key);
-	}
-
-	/**
-	 * This looks up a string in plugin.properties, making a substitution.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static String getString(String key, Object s1) {
-		return ExtendedTypesEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void menuAboutToShow(IMenuManager menuManager) {
-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EditingDomainActionBarContributor getActionBarContributor() {
-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IActionBars getActionBars() {
-		return getActionBarContributor().getActionBars();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public AdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		updateProblemIndication = false;
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
-		getSite().getPage().removePartListener(partListener);
-		adapterFactory.dispose();
-		if (getActionBarContributor().getActiveEditor() == this) {
-			getActionBarContributor().setActiveEditor(null);
-		}
-		for (PropertySheetPage propertySheetPage : propertySheetPages) {
-			propertySheetPage.dispose();
-		}
-		if (contentOutlinePage != null) {
-			contentOutlinePage.dispose();
-		}
-		super.dispose();
-	}
-
-	/**
-	 * Returns whether the outline view should be presented to the user.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean showOutlineView() {
-		return true;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesModelWizard.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesModelWizard.java
deleted file mode 100644
index 763e5d46218..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen/org/eclipse/papyrus/infra/extendedtypes/presentation/ExtendedtypesModelWizard.java
+++ /dev/null
@@ -1,612 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.presentation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.provider.ExtendedTypesEditPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-/**
- * This is a simple wizard for creating a new model file.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ExtendedtypesModelWizard extends Wizard implements INewWizard {
-
-	/**
-	 * The supported extensions for created files.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * A formatted list of supported file extensions, suitable for display.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final String FORMATTED_FILE_EXTENSIONS = ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-	/**
-	 * This caches an instance of the model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ExtendedtypesPackage extendedtypesPackage = ExtendedtypesPackage.eINSTANCE;
-
-	/**
-	 * This caches an instance of the model factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ExtendedtypesFactory extendedtypesFactory = extendedtypesPackage.getExtendedtypesFactory();
-
-	/**
-	 * This is the file creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ExtendedtypesModelWizardNewFileCreationPage newFileCreationPage;
-
-	/**
-	 * This is the initial object creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ExtendedtypesModelWizardInitialObjectCreationPage initialObjectCreationPage;
-
-	/**
-	 * Remember the selection during initialization for populating the default container.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IStructuredSelection selection;
-
-	/**
-	 * Remember the workbench during initialization.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IWorkbench workbench;
-
-	/**
-	 * Caches the names of the types that can be created as the root object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected List<String> initialObjectNames;
-
-	/**
-	 * This just records the information.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.selection = selection;
-		setWindowTitle(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ExtendedTypesEditorPlugin.INSTANCE.getImage("full/wizban/NewExtendedtypes"))); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the names of the types that can be created as the root object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<String> getInitialObjectNames() {
-		if (initialObjectNames == null) {
-			initialObjectNames = new ArrayList<String>();
-			for (EClassifier eClassifier : extendedtypesPackage.getEClassifiers()) {
-				if (eClassifier instanceof EClass) {
-					EClass eClass = (EClass) eClassifier;
-					if (!eClass.isAbstract()) {
-						initialObjectNames.add(eClass.getName());
-					}
-				}
-			}
-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
-		}
-		return initialObjectNames;
-	}
-
-	/**
-	 * Create a new model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected EObject createInitialModel() {
-		EClass eClass = (EClass) extendedtypesPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
-		EObject rootObject = extendedtypesFactory.create(eClass);
-		return rootObject;
-	}
-
-	/**
-	 * Do the work after everything is specified.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean performFinish() {
-		try {
-			// Remember the file.
-			//
-			final IFile modelFile = getModelFile();
-			// Do the work within an operation.
-			//
-			WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-
-				@Override
-				protected void execute(IProgressMonitor progressMonitor) {
-					try {
-						// Create a resource set
-						//
-						ResourceSet resourceSet = new ResourceSetImpl();
-						// Get the URI of the model file.
-						//
-						URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-						// Create a resource for this file.
-						//
-						Resource resource = resourceSet.createResource(fileURI);
-						// Add the initial model object to the contents.
-						//
-						EObject rootObject = createInitialModel();
-						if (rootObject != null) {
-							resource.getContents().add(rootObject);
-						}
-						// Save the contents of the resource to the file system.
-						//
-						Map<Object, Object> options = new HashMap<Object, Object>();
-						options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
-						resource.save(options);
-					} catch (Exception exception) {
-						ExtendedTypesEditorPlugin.INSTANCE.log(exception);
-					} finally {
-						progressMonitor.done();
-					}
-				}
-			};
-			getContainer().run(false, false, operation);
-			// Select the new file resource in the current view.
-			//
-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-			IWorkbenchPage page = workbenchWindow.getActivePage();
-			final IWorkbenchPart activePart = page.getActivePart();
-			if (activePart instanceof ISetSelectionTarget) {
-				final ISelection targetSelection = new StructuredSelection(modelFile);
-				getShell().getDisplay().asyncExec(new Runnable() {
-
-					public void run() {
-						((ISetSelectionTarget) activePart).selectReveal(targetSelection);
-					}
-				});
-			}
-			// Open an editor on the new file.
-			//
-			try {
-				page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
-			} catch (PartInitException exception) {
-				MessageDialog.openError(workbenchWindow.getShell(), ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
-				return false;
-			}
-			return true;
-		} catch (Exception exception) {
-			ExtendedTypesEditorPlugin.INSTANCE.log(exception);
-			return false;
-		}
-	}
-
-	/**
-	 * This is the one page of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public class ExtendedtypesModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
-
-		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public ExtendedtypesModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
-			super(pageId, selection);
-		}
-
-		/**
-		 * The framework calls this to see if the file is correct.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		protected boolean validatePage() {
-			if (super.validatePage()) {
-				String extension = new Path(getFileName()).getFileExtension();
-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
-					setErrorMessage(ExtendedTypesEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));
-					return false;
-				}
-				return true;
-			}
-			return false;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public IFile getModelFile() {
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
-		}
-	}
-
-	/**
-	 * This is the page where the type of object to create is selected.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public class ExtendedtypesModelWizardInitialObjectCreationPage extends WizardPage {
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected Combo initialObjectField;
-
-		/**
-		 * @generated
-		 *            <!-- begin-user-doc -->
-		 *            <!-- end-user-doc -->
-		 */
-		protected List<String> encodings;
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected Combo encodingField;
-
-		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public ExtendedtypesModelWizardInitialObjectCreationPage(String pageId) {
-			super(pageId);
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE);
-			{
-				GridLayout layout = new GridLayout();
-				layout.numColumns = 1;
-				layout.verticalSpacing = 12;
-				composite.setLayout(layout);
-				GridData data = new GridData();
-				data.verticalAlignment = GridData.FILL;
-				data.grabExcessVerticalSpace = true;
-				data.horizontalAlignment = GridData.FILL;
-				composite.setLayoutData(data);
-			}
-			Label containerLabel = new Label(composite, SWT.LEFT);
-			{
-				containerLabel.setText(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ModelObject")); //$NON-NLS-1$
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				containerLabel.setLayoutData(data);
-			}
-			initialObjectField = new Combo(composite, SWT.BORDER);
-			{
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				data.grabExcessHorizontalSpace = true;
-				initialObjectField.setLayoutData(data);
-			}
-			for (String objectName : getInitialObjectNames()) {
-				initialObjectField.add(getLabel(objectName));
-			}
-			if (initialObjectField.getItemCount() == 1) {
-				initialObjectField.select(0);
-			}
-			initialObjectField.addModifyListener(validator);
-			Label encodingLabel = new Label(composite, SWT.LEFT);
-			{
-				encodingLabel.setText(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_XMLEncoding")); //$NON-NLS-1$
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				encodingLabel.setLayoutData(data);
-			}
-			encodingField = new Combo(composite, SWT.BORDER);
-			{
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				data.grabExcessHorizontalSpace = true;
-				encodingField.setLayoutData(data);
-			}
-			for (String encoding : getEncodings()) {
-				encodingField.add(encoding);
-			}
-			encodingField.select(0);
-			encodingField.addModifyListener(validator);
-			setPageComplete(validatePage());
-			setControl(composite);
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected ModifyListener validator = new ModifyListener() {
-
-			public void modifyText(ModifyEvent e) {
-				setPageComplete(validatePage());
-			}
-		};
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected boolean validatePage() {
-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public void setVisible(boolean visible) {
-			super.setVisible(visible);
-			if (visible) {
-				if (initialObjectField.getItemCount() == 1) {
-					initialObjectField.clearSelection();
-					encodingField.setFocus();
-				} else {
-					encodingField.clearSelection();
-					initialObjectField.setFocus();
-				}
-			}
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public String getInitialObjectName() {
-			String label = initialObjectField.getText();
-			for (String name : getInitialObjectNames()) {
-				if (getLabel(name).equals(label)) {
-					return name;
-				}
-			}
-			return null;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public String getEncoding() {
-			return encodingField.getText();
-		}
-
-		/**
-		 * Returns the label for the specified type name.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected String getLabel(String typeName) {
-			try {
-				return ExtendedTypesEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
-			} catch (MissingResourceException mre) {
-				ExtendedTypesEditorPlugin.INSTANCE.log(mre);
-			}
-			return typeName;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected Collection<String> getEncodings() {
-			if (encodings == null) {
-				encodings = new ArrayList<String>();
-				for (StringTokenizer stringTokenizer = new StringTokenizer(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$
-				{
-					encodings.add(stringTokenizer.nextToken());
-				}
-			}
-			return encodings;
-		}
-	}
-
-	/**
-	 * The framework calls this to create the contents of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void addPages() {
-		// Create a page, set the title, and the initial model file name.
-		//
-		newFileCreationPage = new ExtendedtypesModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
-		newFileCreationPage.setTitle(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesModelWizard_label")); //$NON-NLS-1$
-		newFileCreationPage.setDescription(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesModelWizard_description")); //$NON-NLS-1$
-		newFileCreationPage.setFileName(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
-		addPage(newFileCreationPage);
-		// Try and get the resource selection to determine a current directory for the file dialog.
-		//
-		if (selection != null && !selection.isEmpty()) {
-			// Get the resource...
-			//
-			Object selectedElement = selection.iterator().next();
-			if (selectedElement instanceof IResource) {
-				// Get the resource parent, if its a file.
-				//
-				IResource selectedResource = (IResource) selectedElement;
-				if (selectedResource.getType() == IResource.FILE) {
-					selectedResource = selectedResource.getParent();
-				}
-				// This gives us a directory...
-				//
-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
-					// Set this for the container.
-					//
-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
-					// Make up a unique new name here.
-					//
-					String defaultModelBaseFilename = ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesEditorFilenameDefaultBase"); //$NON-NLS-1$
-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {
-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
-					}
-					newFileCreationPage.setFileName(modelFilename);
-				}
-			}
-		}
-		initialObjectCreationPage = new ExtendedtypesModelWizardInitialObjectCreationPage("Whatever2"); //$NON-NLS-1$
-		initialObjectCreationPage.setTitle(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_ExtendedtypesModelWizard_label")); //$NON-NLS-1$
-		initialObjectCreationPage.setDescription(ExtendedTypesEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description")); //$NON-NLS-1$
-		addPage(initialObjectCreationPage);
-	}
-
-	/**
-	 * Get the file from the page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IFile getModelFile() {
-		return newFileCreationPage.getModelFile();
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src/org/eclipse/papyrus/infra/extendedtypes/presentation/CustomExtendedtypesEditor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src/org/eclipse/papyrus/infra/extendedtypes/presentation/CustomExtendedtypesEditor.java
deleted file mode 100644
index 8ab30ef8241..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.editor/src/org/eclipse/papyrus/infra/extendedtypes/presentation/CustomExtendedtypesEditor.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.presentation;
-
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util.InvariantContainerConfigurationAdapterFactory;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.provider.CustomInvariantSemanticTypeConfigurationItemProviderAdapterFactory;
-import org.eclipse.papyrus.infra.extendedtypes.provider.CustomExtendedtypesItemProviderAdapterFactory;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-/**
- * Custom editor to support metamodel extensions
- */
-public class CustomExtendedtypesEditor extends ExtendedtypesEditor {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void initializeEditingDomain() {
-		// Create an adapter factory that yields item providers.
-		//
-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new CustomExtendedtypesItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new CustomInvariantSemanticTypeConfigurationItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new InvariantContainerConfigurationAdapterFactory());
-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-
-		// Create the command stack that will notify this editor as commands are
-		// executed.
-		//
-		BasicCommandStack commandStack = new BasicCommandStack();
-
-		// Add a listener to set the most recent command's affected objects to
-		// be the selection of the viewer with focus.
-		//
-		commandStack.addCommandStackListener(new CommandStackListener() {
-			public void commandStackChanged(final EventObject event) {
-				getContainer().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						firePropertyChange(IEditorPart.PROP_DIRTY);
-
-						// Try to select the affected objects.
-						//
-						Command mostRecentCommand = ((CommandStack) event
-								.getSource()).getMostRecentCommand();
-						if (mostRecentCommand != null) {
-							setSelectionToViewer(mostRecentCommand
-									.getAffectedObjects());
-						}
-						for (Iterator<PropertySheetPage> i = propertySheetPages
-								.iterator(); i.hasNext();) {
-							PropertySheetPage propertySheetPage = i.next();
-							if (propertySheetPage.getControl().isDisposed()) {
-								i.remove();
-							} else {
-								propertySheetPage.refresh();
-							}
-						}
-					}
-				});
-			}
-		});
-
-		// Create the editing domain with a special command stack.
-		//
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
-				commandStack, new HashMap<Resource, Boolean>());
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.classpath b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.classpath
deleted file mode 100644
index 0c22b5d7e6d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.project
deleted file mode 100644
index 97bb4793cf3..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.extendedtypes.emf</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94d61f00da6..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.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.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
-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/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
deleted file mode 100644
index bc2f386c355..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)",
- org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.properties;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.papyrus.infra.extendedtypes.emf,
- org.eclipse.papyrus.infra.extendedtypes.emf.converter,
- org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration,
- org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl,
- org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util,
- org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration,
- org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl,
- org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.emf.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.emf;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/about.html b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/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/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/build.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/build.properties
deleted file mode 100644
index 85562d1f154..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#Mon Sep 12 09:29:52 CEST 2011
-output..=bin/
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               icons/
-jars.compile.order=.
-src.includes = about.html
-source.. = src/,\
-           src-gen/
-bin..=bin/
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/Values.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/Values.gif
deleted file mode 100644
index f1f019535ea..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/Values.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
deleted file mode 100644
index dac4138ca01..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
deleted file mode 100644
index 755e4ca7a46..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
deleted file mode 100644
index 8ce82e3f6c7..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
deleted file mode 100644
index fe708946d58..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
deleted file mode 100644
index 4aaad5a4cd7..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
deleted file mode 100644
index 44afafd55da..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
deleted file mode 100644
index f93c92d061a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
deleted file mode 100644
index 5ef9a94e8da..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
deleted file mode 100644
index bbf242da6a9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
deleted file mode 100644
index f08356ef9bb..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
deleted file mode 100644
index 37dad615792..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
deleted file mode 100644
index 8ce82e3f6c7..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
deleted file mode 100644
index 4aaad5a4cd7..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
deleted file mode 100644
index 33e07420851..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
deleted file mode 100644
index e180c4cf7ca..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
deleted file mode 100644
index 03366e35d0f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
deleted file mode 100644
index 8997497557c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
deleted file mode 100644
index c048169804a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateSetValuesActionConfiguration_featuresToSet_FeatureToSet.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateSetValuesActionConfiguration_featuresToSet_FeatureToSet.gif
deleted file mode 100644
index bf19516c7a4..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/ctool16/CreateSetValuesActionConfiguration_featuresToSet_FeatureToSet.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ConstantValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ConstantValue.gif
deleted file mode 100644
index e4bc22dd17e..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ConstantValue.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/DynamicValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/DynamicValue.gif
deleted file mode 100644
index ed874747401..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/DynamicValue.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/FeatureToSet.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/FeatureToSet.gif
deleted file mode 100644
index 5a9bc7514fa..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/FeatureToSet.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ListValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ListValue.gif
deleted file mode 100644
index c3370c7ddd5..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/ListValue.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/QueryExecutionValue.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/QueryExecutionValue.gif
deleted file mode 100644
index ed874747401..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/QueryExecutionValue.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/SetValuesActionConfiguration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/SetValuesActionConfiguration.gif
deleted file mode 100644
index 7b7c428c715..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/icons/full/obj16/SetValuesActionConfiguration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecore b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecore
deleted file mode 100644
index db788f9a6a9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecore
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="runtimevalueseditionactionconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0"
-    nsPrefix="runtimevalueseditionactionconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="RuntimeValuesEditionActionConfiguration"
-      eSuperTypes="../../org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewsToDisplay" upperBound="-1"
-        eType="#//ViewToDisplay" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ViewToDisplay">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="view" lowerBound="1" eType="ecore:EClass ../../org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecorediag b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecorediag
deleted file mode 100644
index 906dd582bd7..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.ecorediag
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram 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" xmi:id="_6iPDYJM8EeOW09nMQ1MuzQ" type="EcoreTools" name="RuntimeValuesEditionActionConfiguration.ecorediag" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_6igJIJM8EeOW09nMQ1MuzQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_6ilBoJM8EeOW09nMQ1MuzQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_6ilosJM8EeOW09nMQ1MuzQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_6ilosZM8EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6ilospM8EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6ilos5M8EeOW09nMQ1MuzQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_6imPwJM8EeOW09nMQ1MuzQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_6imPwZM8EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6imPwpM8EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6imPw5M8EeOW09nMQ1MuzQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_6igJIZM8EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6igJIpM8EeOW09nMQ1MuzQ" x="130" y="200" height="148"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_6iqhMJM8EeOW09nMQ1MuzQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_6irIQJM8EeOW09nMQ1MuzQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_6irIQZM8EeOW09nMQ1MuzQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_6irIQpM8EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6irIQ5M8EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6irIRJM8EeOW09nMQ1MuzQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_6irIRZM8EeOW09nMQ1MuzQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_6irIRpM8EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_6irIR5M8EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_6irISJM8EeOW09nMQ1MuzQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_6iqhMZM8EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6iqhMpM8EeOW09nMQ1MuzQ" x="570" y="200" width="138" height="148"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_A7S3MJM9EeOW09nMQ1MuzQ" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_A7rRsJM9EeOW09nMQ1MuzQ" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_A7rRsZM9EeOW09nMQ1MuzQ" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_A7TeQJM9EeOW09nMQ1MuzQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_A7UFUJM9EeOW09nMQ1MuzQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_A7UFUZM9EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_A7UFUpM9EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_A7UFU5M9EeOW09nMQ1MuzQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_A7UFVJM9EeOW09nMQ1MuzQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_A7UFVZM9EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_A7UFVpM9EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_A7UFV5M9EeOW09nMQ1MuzQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_A7S3MZM9EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A7S3MpM9EeOW09nMQ1MuzQ" x="145" y="60" width="228"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_OAiPIJM9EeOW09nMQ1MuzQ" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OBIsEJM9EeOW09nMQ1MuzQ" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OBIsEZM9EeOW09nMQ1MuzQ" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_OAkEUJM9EeOW09nMQ1MuzQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_OAkrYJM9EeOW09nMQ1MuzQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_OAkrYZM9EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_OAkrYpM9EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OAkrY5M9EeOW09nMQ1MuzQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_OAlScJM9EeOW09nMQ1MuzQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_OAlScZM9EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_OAlScpM9EeOW09nMQ1MuzQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_OAlSc5M9EeOW09nMQ1MuzQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_OAi2MJM9EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OAi2MZM9EeOW09nMQ1MuzQ" x="860" y="225"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_6iPqcJM8EeOW09nMQ1MuzQ"/>
-  <element xmi:type="ecore:EPackage" href="RuntimeValuesEditionActionConfiguration.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_6i0SMJM8EeOW09nMQ1MuzQ" type="3002" source="_6igJIJM8EeOW09nMQ1MuzQ" target="_6iqhMJM8EeOW09nMQ1MuzQ">
-    <children xmi:type="notation:Node" xmi:id="_6i2HYJM8EeOW09nMQ1MuzQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6i2HYZM8EeOW09nMQ1MuzQ" x="-24" y="-12"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_6i2ucJM8EeOW09nMQ1MuzQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6i2ucZM8EeOW09nMQ1MuzQ" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_6i0SMZM8EeOW09nMQ1MuzQ" routing="Rectilinear" closestDistance="true" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_6i0SMpM8EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration/viewsToDisplay"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6i0SM5M8EeOW09nMQ1MuzQ" points="[9, -25, -198, -27]$[189, -25, -18, -27]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6koQEJM8EeOW09nMQ1MuzQ" id="(0.9656488549618321,0.5878378378378378)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6koQEZM8EeOW09nMQ1MuzQ" id="(0.1792452830188679,0.6013513513513513)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_A7dPQJM9EeOW09nMQ1MuzQ" type="3003" source="_6igJIJM8EeOW09nMQ1MuzQ" target="_A7S3MJM9EeOW09nMQ1MuzQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_A7dPQZM9EeOW09nMQ1MuzQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_A7dPQpM9EeOW09nMQ1MuzQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A7dPQ5M9EeOW09nMQ1MuzQ" points="[0, -73, -3, 111]$[0, -155, -3, 29]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_OBBXUJM9EeOW09nMQ1MuzQ" type="3002" source="_6iqhMJM8EeOW09nMQ1MuzQ" target="_OAiPIJM9EeOW09nMQ1MuzQ">
-    <children xmi:type="notation:Node" xmi:id="_OBB-YJM9EeOW09nMQ1MuzQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OBB-YZM9EeOW09nMQ1MuzQ" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_OBB-YpM9EeOW09nMQ1MuzQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OBB-Y5M9EeOW09nMQ1MuzQ" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_OBBXUZM9EeOW09nMQ1MuzQ" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_OBBXUpM9EeOW09nMQ1MuzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay/view"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OBBXU5M9EeOW09nMQ1MuzQ" points="[-68, -30, 571, 244]$[-638, -274, 1, 0]"/>
-  </edges>
-</notation:Diagram>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.genmodel b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.genmodel
deleted file mode 100644
index b6582c59703..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/RuntimeValuesEditionActionConfiguration.genmodel
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen"
-    editDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen" editorDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.infra.extendedtypes.emf" modelName="RuntimeValuesEditionActionConfiguration"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.genmodel#//properties"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>RuntimeValuesEditionActionConfiguration.ecore</foreignModel>
-  <genPackages prefix="RuntimeValuesEditionActionConfiguration" disposableProviderFactory="true" resource="XML"  basePackage="org.eclipse.papyrus.infra.extendedtypes.emf"
-      ecorePackage="RuntimeValuesEditionActionConfiguration.ecore#/">
-    <genClasses ecoreClass="RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeValuesEditionActionConfiguration.ecore#//RuntimeValuesEditionActionConfiguration/viewsToDisplay"/>
-    </genClasses>
-    <genClasses ecoreClass="RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuntimeValuesEditionActionConfiguration.ecore#//ViewToDisplay/view"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecore b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecore
deleted file mode 100644
index 6bab0eeabb8..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecore
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="setvaluesactionconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"
-    nsPrefix="setvaluesactionconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="SetValuesActionConfiguration" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"
-        eType="#//FeatureToSet" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"
-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
-        eType="#//FeatureValue" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>
-</ecore:EPackage>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecorediag b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecorediag
deleted file mode 100644
index 34ae16642b8..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.ecorediag
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram 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" xmi:id="_ay7h0FSgEeC-0syXieMmHA" type="EcoreTools" name="SetValuesActionConfiguration" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_omszsFSgEeC-0syXieMmHA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_omszs1SgEeC-0syXieMmHA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_omsztFSgEeC-0syXieMmHA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_omsztVSgEeC-0syXieMmHA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_omsztlSgEeC-0syXieMmHA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_omszt1SgEeC-0syXieMmHA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_omszuFSgEeC-0syXieMmHA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_omszuVSgEeC-0syXieMmHA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_omszulSgEeC-0syXieMmHA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_omszu1SgEeC-0syXieMmHA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_omszsVSgEeC-0syXieMmHA" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_omszslSgEeC-0syXieMmHA" x="50" y="310" width="306" height="87"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_m7JwcVVnEeCZTbk4eXVjvg" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_m7ThcFVnEeCZTbk4eXVjvg" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_m7ThcVVnEeCZTbk4eXVjvg" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_rSjOgFVnEeCZTbk4eXVjvg" type="2001">
-        <element xmi:type="ecore:EAttribute" href="SetValuesActionConfiguration.ecore#//FeatureToSet/featureName"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rSjOgVVnEeCZTbk4eXVjvg"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_m7ThclVnEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_m7Thc1VnEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_m7ThdFVnEeCZTbk4eXVjvg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_m7ThdVVnEeCZTbk4eXVjvg" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_m7ThdlVnEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_m7Thd1VnEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_m7TheFVnEeCZTbk4eXVjvg"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_m7JwclVnEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//FeatureToSet"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m7Jwc1VnEeCZTbk4eXVjvg" x="480" y="310" width="198" height="83"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_FCIyIFVoEeCZTbk4eXVjvg" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_FCIyI1VoEeCZTbk4eXVjvg" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_FCIyJFVoEeCZTbk4eXVjvg" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FCIyJVVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_FCIyJlVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FCIyJ1VoEeCZTbk4eXVjvg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_FCIyKFVoEeCZTbk4eXVjvg" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FCIyKVVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_FCIyKlVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_FCIyK1VoEeCZTbk4eXVjvg"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_FCIyIVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//FeatureValue"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FCIyIlVoEeCZTbk4eXVjvg" x="810" y="310" width="188" height="83"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_ataLwFVoEeCZTbk4eXVjvg" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_ataLw1VoEeCZTbk4eXVjvg" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_ataLxFVoEeCZTbk4eXVjvg" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ataLxVVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ataLxlVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ataLx1VoEeCZTbk4eXVjvg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ataLyFVoEeCZTbk4eXVjvg" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ataLyVVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ataLylVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ataLy1VoEeCZTbk4eXVjvg"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ataLwVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//DynamicValue"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ataLwlVoEeCZTbk4eXVjvg" x="110" y="495" width="183" height="58"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_d-nd0FVoEeCZTbk4eXVjvg" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_d-nd01VoEeCZTbk4eXVjvg" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_d-nd1FVoEeCZTbk4eXVjvg" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_d-nd1VVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_d-nd1lVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_d-nd11VoEeCZTbk4eXVjvg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_d-xO0FVoEeCZTbk4eXVjvg" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_d-xO0VVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_d-xO0lVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_d-xO01VoEeCZTbk4eXVjvg"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_d-nd0VVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//ConstantValue"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d-nd0lVoEeCZTbk4eXVjvg" x="480" y="495" width="153" height="58"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_j3TvgFVoEeCZTbk4eXVjvg" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_j3Tvg1VoEeCZTbk4eXVjvg" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_j3TvhFVoEeCZTbk4eXVjvg" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_j3TvhVVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_j3TvhlVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_j3Tvh1VoEeCZTbk4eXVjvg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_j3TviFVoEeCZTbk4eXVjvg" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_j3TviVVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_j3TvilVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_j3Tvi1VoEeCZTbk4eXVjvg"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_j3TvgVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//ListValue"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j3TvglVoEeCZTbk4eXVjvg" x="875" y="495" width="143" height="58"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_nJRPgFVoEeCZTbk4eXVjvg" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_nJRPg1VoEeCZTbk4eXVjvg" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_nJRPhFVoEeCZTbk4eXVjvg" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_nJRPhVVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_nJRPhlVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_nJRPh1VoEeCZTbk4eXVjvg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_nJRPiFVoEeCZTbk4eXVjvg" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_nJRPiVVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_nJRPilVoEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_nJRPi1VoEeCZTbk4eXVjvg"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_nJRPgVVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="SetValuesActionConfiguration.ecore#//QueryExecutionValue"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nJRPglVoEeCZTbk4eXVjvg" x="110" y="640" width="173" height="58"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_CjJ_gFVuEeCZTbk4eXVjvg" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CjJ_jFVuEeCZTbk4eXVjvg" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CjJ_jVVuEeCZTbk4eXVjvg" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_CjJ_g1VuEeCZTbk4eXVjvg" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_CjJ_hFVuEeCZTbk4eXVjvg" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_CjJ_hVVuEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_CjJ_hlVuEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_CjJ_h1VuEeCZTbk4eXVjvg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_CjJ_iFVuEeCZTbk4eXVjvg" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_CjJ_iVVuEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_CjJ_ilVuEeCZTbk4eXVjvg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_CjJ_i1VuEeCZTbk4eXVjvg"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_CjJ_gVVuEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10" fillColor="12560536" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CjJ_glVuEeCZTbk4eXVjvg" x="360" y="610" width="293" height="218"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_bdSXoIK0EeOjkMhtoir5vQ" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bi86wIK0EeOjkMhtoir5vQ" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bi86wYK0EeOjkMhtoir5vQ" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_bdTlwIK0EeOjkMhtoir5vQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_bdUz4IK0EeOjkMhtoir5vQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_bdUz4YK0EeOjkMhtoir5vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_bdUz4oK0EeOjkMhtoir5vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bdUz44K0EeOjkMhtoir5vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_bdVa8IK0EeOjkMhtoir5vQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_bdVa8YK0EeOjkMhtoir5vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_bdVa8oK0EeOjkMhtoir5vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bdVa84K0EeOjkMhtoir5vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_bdSXoYK0EeOjkMhtoir5vQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bdSXooK0EeOjkMhtoir5vQ" x="110" y="125"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_ay7h0VSgEeC-0syXieMmHA"/>
-  <element xmi:type="ecore:EPackage" href="SetValuesActionConfiguration.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_xbMAsFVnEeCZTbk4eXVjvg" type="3002" source="_omszsFSgEeC-0syXieMmHA" target="_m7JwcVVnEeCZTbk4eXVjvg">
-    <children xmi:type="notation:Node" xmi:id="_xbMAtFVnEeCZTbk4eXVjvg" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xbMAtVVnEeCZTbk4eXVjvg" x="-25" y="-9"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xbMAtlVnEeCZTbk4eXVjvg" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xbMAt1VnEeCZTbk4eXVjvg" y="11"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xbMAsVVnEeCZTbk4eXVjvg" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xbMAslVnEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration/featuresToSet"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xbMAs1VnEeCZTbk4eXVjvg" points="[52, 0, -233, 2]$[286, 29, 1, 31]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xbVKoFVnEeCZTbk4eXVjvg" id="(0.8300653594771242,0.5632183908045977)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xbVKoVVnEeCZTbk4eXVjvg" id="(0.2,0.5921052631578947)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_S2gg8FVoEeCZTbk4eXVjvg" type="3002" source="_m7JwcVVnEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">
-    <children xmi:type="notation:Node" xmi:id="_S2gg9FVoEeCZTbk4eXVjvg" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_S2gg9VVoEeCZTbk4eXVjvg" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_S2gg9lVoEeCZTbk4eXVjvg" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_S2gg91VoEeCZTbk4eXVjvg" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_S2gg8VVoEeCZTbk4eXVjvg" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_S2gg8lVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//FeatureToSet/value"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_S2gg81VoEeCZTbk4eXVjvg" points="[20, 9, -141, 1]$[162, -26, 1, -34]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S2gg-FVoEeCZTbk4eXVjvg" id="(0.898989898989899,0.3253012048192771)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_S2gg-VVoEeCZTbk4eXVjvg" id="(0.12234042553191489,0.42168674698795183)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_dE8q4FVoEeCZTbk4eXVjvg" type="3003" source="_ataLwFVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dE8q4VVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_dE8q4lVoEeCZTbk4eXVjvg"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dE8q41VoEeCZTbk4eXVjvg" points="[-16, -8, -727, 120]$[-16, -53, -727, 75]$[694, -53, -17, 75]$[694, -112, -17, 16]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dE8q5FVoEeCZTbk4eXVjvg" id="(0.5628415300546448,0.15517241379310345)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dE8q5VVoEeCZTbk4eXVjvg" id="(0.6063829787234043,0.8072289156626506)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_f3BJ4FVoEeCZTbk4eXVjvg" type="3003" source="_d-nd0FVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_f3BJ4VVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_f3BJ4lVoEeCZTbk4eXVjvg"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f3BJ41VoEeCZTbk4eXVjvg" points="[0, 0, -323, 104]$[0, -45, -323, 59]$[325, -45, 2, 59]$[325, -104, 2, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f3KT0FVoEeCZTbk4eXVjvg" id="(0.6666666666666666,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f3KT0VVoEeCZTbk4eXVjvg" id="(0.5,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_l4DfQFVoEeCZTbk4eXVjvg" type="3003" source="_j3TvgFVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_l4DfQVVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_l4DfQlVoEeCZTbk4eXVjvg"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l4DfQ1VoEeCZTbk4eXVjvg" points="[12, -4, 72, 123]$[12, -49, 72, 78]$[-53, -49, 7, 78]$[-53, -108, 7, 19]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4DfRFVoEeCZTbk4eXVjvg" id="(0.5244755244755245,0.08620689655172414)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4DfRVVoEeCZTbk4eXVjvg" id="(0.5053191489361702,0.7710843373493976)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_wuI4AFVoEeCZTbk4eXVjvg" type="3003" source="_nJRPgFVoEeCZTbk4eXVjvg" target="_ataLwFVoEeCZTbk4eXVjvg">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_wuI4AVVoEeCZTbk4eXVjvg" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_wuI4AlVoEeCZTbk4eXVjvg"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wuI4A1VoEeCZTbk4eXVjvg" points="[-28, 0, 13, 102]$[-28, -89, 13, 13]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wuI4BFVoEeCZTbk4eXVjvg" id="(0.6647398843930635,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fYiPwIK1EeOjkMhtoir5vQ" id="(0.3989071038251366,0.7758620689655172)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_2veIUFVoEeCZTbk4eXVjvg" type="3002" source="_j3TvgFVoEeCZTbk4eXVjvg" target="_FCIyIFVoEeCZTbk4eXVjvg">
-    <children xmi:type="notation:Node" xmi:id="_2veIVFVoEeCZTbk4eXVjvg" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_2veIVVVoEeCZTbk4eXVjvg" x="10" y="-12"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_2veIVlVoEeCZTbk4eXVjvg" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_2veIV1VoEeCZTbk4eXVjvg" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_2veIUVVoEeCZTbk4eXVjvg" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_2veIUlVoEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//ListValue/values"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2veIU1VoEeCZTbk4eXVjvg" points="[24, 0, 43, 161]$[60, 0, 79, 161]$[60, -161, 79, 0]$[4, -161, 23, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2vn5UFVoEeCZTbk4eXVjvg" id="(0.8321678321678322,0.39655172413793105)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2vn5UVVoEeCZTbk4eXVjvg" id="(0.8776595744680851,0.5783132530120482)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_ClZbMFVuEeCZTbk4eXVjvg" type="3002" source="_d-nd0FVoEeCZTbk4eXVjvg" target="_CjJ_gFVuEeCZTbk4eXVjvg">
-    <children xmi:type="notation:Node" xmi:id="_ClZbNFVuEeCZTbk4eXVjvg" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ClZbNVVuEeCZTbk4eXVjvg" x="-8" y="-46"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ClZbNlVuEeCZTbk4eXVjvg" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ClZbN1VuEeCZTbk4eXVjvg" x="-3" y="17"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ClZbMVVuEeCZTbk4eXVjvg" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_ClZbMlVuEeCZTbk4eXVjvg" fontColor="4210752" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="SetValuesActionConfiguration.ecore#//ConstantValue/valueInstance"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ClZbM1VuEeCZTbk4eXVjvg" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Cm4o8FVuEeCZTbk4eXVjvg" id="(0.3333333333333333,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Cm4o8VVuEeCZTbk4eXVjvg" id="(0.6245733788395904,0.03164556962025317)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_gIqhoIK0EeOjkMhtoir5vQ" type="3003" source="_omszsFSgEeC-0syXieMmHA" target="_bdSXoIK0EeOjkMhtoir5vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_gIrIsIK0EeOjkMhtoir5vQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_gIrIsYK0EeOjkMhtoir5vQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gIrIsoK0EeOjkMhtoir5vQ" points="[-2, -42, -2, 156]$[-2, -169, -2, 29]"/>
-  </edges>
-</notation:Diagram>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.genmodel b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.genmodel
deleted file mode 100644
index ce8adb4ffcd..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/model/SetValuesActionConfiguration.genmodel
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen"
-    editDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen" editorDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.infra.extendedtypes.emf" modelName="SetValuesActionConfiguration"
-    editPluginClass="org.eclipse.papyrus.infra.extendedtypes.emf.Activator" testsDirectory="/org.eclipse.papyrus.infra.extendedtypes.emf.tests/src-gen"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types">
-  <foreignModel>SetValuesActionConfiguration.ecore</foreignModel>
-  <genPackages prefix="SetValuesActionConfiguration" basePackage="org.eclipse.papyrus.infra.extendedtypes.emf"
-      resource="XML" disposableProviderFactory="true" ecorePackage="SetValuesActionConfiguration.ecore#/">
-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//SetValuesActionConfiguration/featuresToSet"/>
-    </genClasses>
-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//FeatureToSet">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetValuesActionConfiguration.ecore#//FeatureToSet/featureName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//FeatureToSet/value"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="SetValuesActionConfiguration.ecore#//FeatureValue"/>
-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//DynamicValue"/>
-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//ConstantValue">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//ConstantValue/valueInstance"/>
-    </genClasses>
-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//ListValue">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesActionConfiguration.ecore#//ListValue/values"/>
-    </genClasses>
-    <genClasses ecoreClass="SetValuesActionConfiguration.ecore#//QueryExecutionValue"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.properties
deleted file mode 100644
index 3f1f4430b9f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-pluginName = EMF ExtendedTypes Model
-providerName = Eclipse Modeling Project
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
_UI_PropertyDescriptor_description = The {0} of the {1}
-
_UI_SetValuesActionConfiguration_type = Set Values Action Configuration
-_UI_FeatureToSet_type = Feature To Set
-_UI_FeatureValue_type = Feature Value
-_UI_DynamicValue_type = Dynamic Value
-_UI_ConstantValue_type = Constant Value
-_UI_ListValue_type = List Value
-_UI_QueryExecutionValue_type = Query Execution Value
-_UI_Unknown_type = Object
-
_UI_Unknown_datatype= Value
-
_UI_SetValuesActionConfiguration_featuresToSet_feature = Features To Set
-_UI_FeatureToSet_featureName_feature = Feature Name
-_UI_FeatureToSet_value_feature = Value
-_UI_FeatureToSet_atRuntime_feature = At Runtime
-_UI_ConstantValue_valueInstance_feature = Value Instance
-_UI_ListValue_values_feature = Values
-_UI_Unknown_feature = Unspecified
-
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml
deleted file mode 100644
index 1b469fcf126..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/plugin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated SetValuesActionConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0"
-            class="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage"
-            genModel="model/SetValuesActionConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated SetValuesActionConfiguration -->
-      <parser
-            type="setvaluesactionconfiguration"
-            class="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationResourceFactoryImpl"/>
-   </extension>
-
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated RuntimeValuesEditionActionConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0"
-            class="org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage"
-            genModel="model/RuntimeValuesEditionActionConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated RuntimeValuesEditionActionConfiguration -->
-      <parser
-            type="runtimevalueseditionactionconfiguration"
-            class="org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util.RuntimeValuesEditionActionConfigurationResourceFactoryImpl"/>
-   </extension>
-
-   <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.aspectActionConfiguration">
-      <aspectAction
-            configurationClass="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration"
-            configurationModelCreation="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationModelCreation"
-            creationElementValidator="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionCreationElementValidator"
-            editHelperAdvice="org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionEditHelperAdvice">
-      </aspectAction>
-   </extension>
-</plugin>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml
deleted file mode 100644
index 94285dc4a89..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.infra-xtypes</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.extendedtypes.emf</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfiguration.java
deleted file mode 100644
index 0da2d94be63..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfiguration.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Runtime Values Edition Action Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration#getViewsToDisplay <em>Views To Display</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getRuntimeValuesEditionActionConfiguration()
- * @model
- * @generated
- */
-public interface RuntimeValuesEditionActionConfiguration extends SemanticActionConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Views To Display</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Views To Display</em>' containment reference list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Views To Display</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getRuntimeValuesEditionActionConfiguration_ViewsToDisplay()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<ViewToDisplay> getViewsToDisplay();
-
-} // RuntimeValuesEditionActionConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationFactory.java
deleted file mode 100644
index 87f332c481d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage
- * @generated
- */
-public interface RuntimeValuesEditionActionConfigurationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	RuntimeValuesEditionActionConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Runtime Values Edition Action Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Runtime Values Edition Action Configuration</em>'.
-	 * @generated
-	 */
-	RuntimeValuesEditionActionConfiguration createRuntimeValuesEditionActionConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>View To Display</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>View To Display</em>'.
-	 * @generated
-	 */
-	ViewToDisplay createViewToDisplay();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	RuntimeValuesEditionActionConfigurationPackage getRuntimeValuesEditionActionConfigurationPackage();
-
-} // RuntimeValuesEditionActionConfigurationFactory
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationPackage.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationPackage.java
deleted file mode 100644
index 000d647b887..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/RuntimeValuesEditionActionConfigurationPackage.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory
- * @model kind="package"
- * @generated
- */
-public interface RuntimeValuesEditionActionConfigurationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNAME = "runtimevalueseditionactionconfiguration";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/emf/runtimevalueseditionaction/1.0";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_PREFIX = "runtimevalueseditionactionconfiguration";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	RuntimeValuesEditionActionConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl <em>Runtime Values Edition Action Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getRuntimeValuesEditionActionConfiguration()
-	 * @generated
-	 */
-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__NAME = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__DESCRIPTION = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__IDENTIFIER = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__ICON_ENTRY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__ICON_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Views To Display</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Runtime Values Edition Action Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl <em>View To Display</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getViewToDisplay()
-	 * @generated
-	 */
-	int VIEW_TO_DISPLAY = 1;
-
-	/**
-	 * The feature id for the '<em><b>View</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TO_DISPLAY__VIEW = 0;
-
-	/**
-	 * The number of structural features of the '<em>View To Display</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TO_DISPLAY_FEATURE_COUNT = 1;
-
-	/**
-	 * The number of operations of the '<em>View To Display</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TO_DISPLAY_OPERATION_COUNT = 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration <em>Runtime Values Edition Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Runtime Values Edition Action Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration
-	 * @generated
-	 */
-	EClass getRuntimeValuesEditionActionConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration#getViewsToDisplay <em>Views To Display</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Views To Display</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration#getViewsToDisplay()
-	 * @see #getRuntimeValuesEditionActionConfiguration()
-	 * @generated
-	 */
-	EReference getRuntimeValuesEditionActionConfiguration_ViewsToDisplay();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay <em>View To Display</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>View To Display</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay
-	 * @generated
-	 */
-	EClass getViewToDisplay();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView <em>View</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the reference '<em>View</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView()
-	 * @see #getViewToDisplay()
-	 * @generated
-	 */
-	EReference getViewToDisplay_View();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	RuntimeValuesEditionActionConfigurationFactory getRuntimeValuesEditionActionConfigurationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 * <li>each class,</li>
-	 * <li>each feature of each class,</li>
-	 * <li>each operation of each class,</li>
-	 * <li>each enum,</li>
-	 * <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl <em>Runtime Values Edition Action Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getRuntimeValuesEditionActionConfiguration()
-		 * @generated
-		 */
-		EClass RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION = eINSTANCE.getRuntimeValuesEditionActionConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Views To Display</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY = eINSTANCE.getRuntimeValuesEditionActionConfiguration_ViewsToDisplay();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl <em>View To Display</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationPackageImpl#getViewToDisplay()
-		 * @generated
-		 */
-		EClass VIEW_TO_DISPLAY = eINSTANCE.getViewToDisplay();
-
-		/**
-		 * The meta object literal for the '<em><b>View</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference VIEW_TO_DISPLAY__VIEW = eINSTANCE.getViewToDisplay_View();
-
-	}
-
-} // RuntimeValuesEditionActionConfigurationPackage
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/ViewToDisplay.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/ViewToDisplay.java
deleted file mode 100644
index d935cbc42f9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/ViewToDisplay.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.properties.contexts.View;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>View To Display</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView <em>View</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getViewToDisplay()
- * @model
- * @generated
- */
-public interface ViewToDisplay extends EObject {
-	/**
-	 * Returns the value of the '<em><b>View</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>View</em>' reference isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>View</em>' reference.
-	 * @see #setView(View)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#getViewToDisplay_View()
-	 * @model required="true"
-	 * @generated
-	 * @since 2.0
-	 */
-	View getView();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay#getView <em>View</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>View</em>' reference.
-	 * @see #getView()
-	 * @generated
-	 * @since 2.0
-	 */
-	void setView(View value);
-
-} // ViewToDisplay
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationFactoryImpl.java
deleted file mode 100644
index 140e53abb7d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class RuntimeValuesEditionActionConfigurationFactoryImpl extends EFactoryImpl implements RuntimeValuesEditionActionConfigurationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static RuntimeValuesEditionActionConfigurationFactory init() {
-		try {
-			RuntimeValuesEditionActionConfigurationFactory theRuntimeValuesEditionActionConfigurationFactory = (RuntimeValuesEditionActionConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(RuntimeValuesEditionActionConfigurationPackage.eNS_URI);
-			if (theRuntimeValuesEditionActionConfigurationFactory != null) {
-				return theRuntimeValuesEditionActionConfigurationFactory;
-			}
-		} catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new RuntimeValuesEditionActionConfigurationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public RuntimeValuesEditionActionConfigurationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION:
-			return createRuntimeValuesEditionActionConfiguration();
-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY:
-			return createViewToDisplay();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public RuntimeValuesEditionActionConfiguration createRuntimeValuesEditionActionConfiguration() {
-		RuntimeValuesEditionActionConfigurationImpl runtimeValuesEditionActionConfiguration = new RuntimeValuesEditionActionConfigurationImpl();
-		return runtimeValuesEditionActionConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ViewToDisplay createViewToDisplay() {
-		ViewToDisplayImpl viewToDisplay = new ViewToDisplayImpl();
-		return viewToDisplay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public RuntimeValuesEditionActionConfigurationPackage getRuntimeValuesEditionActionConfigurationPackage() {
-		return (RuntimeValuesEditionActionConfigurationPackage) getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static RuntimeValuesEditionActionConfigurationPackage getPackage() {
-		return RuntimeValuesEditionActionConfigurationPackage.eINSTANCE;
-	}
-
-} // RuntimeValuesEditionActionConfigurationFactoryImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationImpl.java
deleted file mode 100644
index 5572aaec7b5..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
-import org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Runtime Values Edition Action Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.RuntimeValuesEditionActionConfigurationImpl#getViewsToDisplay <em>Views To Display</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RuntimeValuesEditionActionConfigurationImpl extends SemanticActionConfigurationImpl implements RuntimeValuesEditionActionConfiguration {
-	/**
-	 * The cached value of the '{@link #getViewsToDisplay() <em>Views To Display</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getViewsToDisplay()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ViewToDisplay> viewsToDisplay;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected RuntimeValuesEditionActionConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return RuntimeValuesEditionActionConfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EList<ViewToDisplay> getViewsToDisplay() {
-		if (viewsToDisplay == null) {
-			viewsToDisplay = new EObjectContainmentEList<ViewToDisplay>(ViewToDisplay.class, this, RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY);
-		}
-		return viewsToDisplay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:
-			return ((InternalEList<?>) getViewsToDisplay()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:
-			return getViewsToDisplay();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:
-			getViewsToDisplay().clear();
-			getViewsToDisplay().addAll((Collection<? extends ViewToDisplay>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:
-			getViewsToDisplay().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY:
-			return viewsToDisplay != null && !viewsToDisplay.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // RuntimeValuesEditionActionConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationPackageImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationPackageImpl.java
deleted file mode 100644
index 614e0a694d0..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/RuntimeValuesEditionActionConfigurationPackageImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
-import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage;
-import org.eclipse.papyrus.infra.properties.environment.EnvironmentPackage;
-import org.eclipse.papyrus.infra.properties.ui.UiPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class RuntimeValuesEditionActionConfigurationPackageImpl extends EPackageImpl implements RuntimeValuesEditionActionConfigurationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass runtimeValuesEditionActionConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass viewToDisplayEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private RuntimeValuesEditionActionConfigurationPackageImpl() {
-		super(eNS_URI, RuntimeValuesEditionActionConfigurationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
-	 * <p>
-	 * This method is used to initialize {@link RuntimeValuesEditionActionConfigurationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static RuntimeValuesEditionActionConfigurationPackage init() {
-		if (isInited) {
-			return (RuntimeValuesEditionActionConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(RuntimeValuesEditionActionConfigurationPackage.eNS_URI);
-		}
-
-		// Obtain or create and register package
-		RuntimeValuesEditionActionConfigurationPackageImpl theRuntimeValuesEditionActionConfigurationPackage = (RuntimeValuesEditionActionConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RuntimeValuesEditionActionConfigurationPackageImpl ? EPackage.Registry.INSTANCE
-				.get(eNS_URI) : new RuntimeValuesEditionActionConfigurationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ExtendedtypesPackage.eINSTANCE.eClass();
-		EnvironmentPackage.eINSTANCE.eClass();
-		ContextsPackage.eINSTANCE.eClass();
-		UiPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theRuntimeValuesEditionActionConfigurationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theRuntimeValuesEditionActionConfigurationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theRuntimeValuesEditionActionConfigurationPackage.freeze();
-
-
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(RuntimeValuesEditionActionConfigurationPackage.eNS_URI, theRuntimeValuesEditionActionConfigurationPackage);
-		return theRuntimeValuesEditionActionConfigurationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EClass getRuntimeValuesEditionActionConfiguration() {
-		return runtimeValuesEditionActionConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EReference getRuntimeValuesEditionActionConfiguration_ViewsToDisplay() {
-		return (EReference) runtimeValuesEditionActionConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EClass getViewToDisplay() {
-		return viewToDisplayEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EReference getViewToDisplay_View() {
-		return (EReference) viewToDisplayEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public RuntimeValuesEditionActionConfigurationFactory getRuntimeValuesEditionActionConfigurationFactory() {
-		return (RuntimeValuesEditionActionConfigurationFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package. This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) {
-			return;
-		}
-		isCreated = true;
-
-		// Create classes and their features
-		runtimeValuesEditionActionConfigurationEClass = createEClass(RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION);
-		createEReference(runtimeValuesEditionActionConfigurationEClass, RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION__VIEWS_TO_DISPLAY);
-
-		viewToDisplayEClass = createEClass(VIEW_TO_DISPLAY);
-		createEReference(viewToDisplayEClass, VIEW_TO_DISPLAY__VIEW);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model. This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) {
-			return;
-		}
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);
-		ContextsPackage theContextsPackage = (ContextsPackage) EPackage.Registry.INSTANCE.getEPackage(ContextsPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		runtimeValuesEditionActionConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getSemanticActionConfiguration());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(runtimeValuesEditionActionConfigurationEClass, RuntimeValuesEditionActionConfiguration.class, "RuntimeValuesEditionActionConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getRuntimeValuesEditionActionConfiguration_ViewsToDisplay(), this.getViewToDisplay(), null, "viewsToDisplay", null, 0, -1, RuntimeValuesEditionActionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(viewToDisplayEClass, ViewToDisplay.class, "ViewToDisplay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getViewToDisplay_View(), theContextsPackage.getView(), null, "view", null, 1, 1, ViewToDisplay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} // RuntimeValuesEditionActionConfigurationPackageImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/ViewToDisplayImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/ViewToDisplayImpl.java
deleted file mode 100644
index f3df9e53dba..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/impl/ViewToDisplayImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
-import org.eclipse.papyrus.infra.properties.contexts.View;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>View To Display</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.impl.ViewToDisplayImpl#getView <em>View</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements ViewToDisplay {
-	/**
-	 * The cached value of the '{@link #getView() <em>View</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getView()
-	 * @generated
-	 * @ordered
-	 */
-	protected View view;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ViewToDisplayImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return RuntimeValuesEditionActionConfigurationPackage.Literals.VIEW_TO_DISPLAY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @since 2.0
-	 */
-	@Override
-	public View getView() {
-		if (view != null && view.eIsProxy()) {
-			InternalEObject oldView = (InternalEObject) view;
-			view = (View) eResolveProxy(oldView);
-			if (view != oldView) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
-				}
-			}
-		}
-		return view;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @since 2.0
-	 */
-	public View basicGetView() {
-		return view;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @since 2.0
-	 */
-	@Override
-	public void setView(View newView) {
-		View oldView = view;
-		view = newView;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
-			if (resolve) {
-				return getView();
-			}
-			return basicGetView();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
-			setView((View) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
-			setView((View) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY__VIEW:
-			return view != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // ViewToDisplayImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationAdapterFactory.java
deleted file mode 100644
index 4ab571e6f8c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage
- * @generated
- */
-public class RuntimeValuesEditionActionConfigurationAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static RuntimeValuesEditionActionConfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public RuntimeValuesEditionActionConfigurationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = RuntimeValuesEditionActionConfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected RuntimeValuesEditionActionConfigurationSwitch<Adapter> modelSwitch =
-			new RuntimeValuesEditionActionConfigurationSwitch<Adapter>() {
-				@Override
-				public Adapter caseRuntimeValuesEditionActionConfiguration(RuntimeValuesEditionActionConfiguration object) {
-					return createRuntimeValuesEditionActionConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter caseViewToDisplay(ViewToDisplay object) {
-					return createViewToDisplayAdapter();
-				}
-
-				@Override
-				public Adapter caseConfigurationElement(ConfigurationElement object) {
-					return createConfigurationElementAdapter();
-				}
-
-				@Override
-				public Adapter caseActionConfiguration(ActionConfiguration object) {
-					return createActionConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter caseSemanticActionConfiguration(SemanticActionConfiguration object) {
-					return createSemanticActionConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter defaultCase(EObject object) {
-					return createEObjectAdapter();
-				}
-			};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param target
-	 *            the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration <em>Runtime Values Edition Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration
-	 * @generated
-	 */
-	public Adapter createRuntimeValuesEditionActionConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay <em>View To Display</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay
-	 * @generated
-	 */
-	public Adapter createViewToDisplayAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement
-	 * @generated
-	 */
-	public Adapter createConfigurationElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration
-	 * @generated
-	 */
-	public Adapter createActionConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration <em>Semantic Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration
-	 * @generated
-	 */
-	public Adapter createSemanticActionConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} // RuntimeValuesEditionActionConfigurationAdapterFactory
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceFactoryImpl.java
deleted file mode 100644
index b2260ef2955..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util.RuntimeValuesEditionActionConfigurationResourceImpl
- * @generated
- */
-public class RuntimeValuesEditionActionConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public RuntimeValuesEditionActionConfigurationResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Resource createResource(URI uri) {
-		Resource result = new RuntimeValuesEditionActionConfigurationResourceImpl(uri);
-		return result;
-	}
-
-} // RuntimeValuesEditionActionConfigurationResourceFactoryImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceImpl.java
deleted file mode 100644
index 55076a59919..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationResourceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util.RuntimeValuesEditionActionConfigurationResourceFactoryImpl
- * @generated
- */
-public class RuntimeValuesEditionActionConfigurationResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param uri
-	 *            the URI of the new resource.
-	 * @generated
-	 */
-	public RuntimeValuesEditionActionConfigurationResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} // RuntimeValuesEditionActionConfigurationResourceImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationSwitch.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationSwitch.java
deleted file mode 100644
index 79382851ef3..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationSwitch.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage
- * @generated
- */
-public class RuntimeValuesEditionActionConfigurationSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static RuntimeValuesEditionActionConfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public RuntimeValuesEditionActionConfigurationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = RuntimeValuesEditionActionConfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case RuntimeValuesEditionActionConfigurationPackage.RUNTIME_VALUES_EDITION_ACTION_CONFIGURATION: {
-			RuntimeValuesEditionActionConfiguration runtimeValuesEditionActionConfiguration = (RuntimeValuesEditionActionConfiguration) theEObject;
-			T result = caseRuntimeValuesEditionActionConfiguration(runtimeValuesEditionActionConfiguration);
-			if (result == null) {
-				result = caseSemanticActionConfiguration(runtimeValuesEditionActionConfiguration);
-			}
-			if (result == null) {
-				result = caseActionConfiguration(runtimeValuesEditionActionConfiguration);
-			}
-			if (result == null) {
-				result = caseConfigurationElement(runtimeValuesEditionActionConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case RuntimeValuesEditionActionConfigurationPackage.VIEW_TO_DISPLAY: {
-			ViewToDisplay viewToDisplay = (ViewToDisplay) theEObject;
-			T result = caseViewToDisplay(viewToDisplay);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Runtime Values Edition Action Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Runtime Values Edition Action Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRuntimeValuesEditionActionConfiguration(RuntimeValuesEditionActionConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>View To Display</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>View To Display</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseViewToDisplay(ViewToDisplay object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Configuration Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Configuration Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseConfigurationElement(ConfigurationElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Action Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Action Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseActionConfiguration(ActionConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Action Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Semantic Action Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSemanticActionConfiguration(SemanticActionConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} // RuntimeValuesEditionActionConfigurationSwitch
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationXMLProcessor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationXMLProcessor.java
deleted file mode 100644
index f0d43a78965..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/runtimevalueseditionactionconfiguration/util/RuntimeValuesEditionActionConfigurationXMLProcessor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class RuntimeValuesEditionActionConfigurationXMLProcessor extends XMLProcessor {
-
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public RuntimeValuesEditionActionConfigurationXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		RuntimeValuesEditionActionConfigurationPackage.eINSTANCE.eClass();
-	}
-
-	/**
-	 * Register for "*" and "xml" file extensions the RuntimeValuesEditionActionConfigurationResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new RuntimeValuesEditionActionConfigurationResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new RuntimeValuesEditionActionConfigurationResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} // RuntimeValuesEditionActionConfigurationXMLProcessor
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ConstantValue.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ConstantValue.java
deleted file mode 100644
index 3eae9ed6516..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ConstantValue.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constant Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getConstantValue()
- * @model
- * @generated
- */
-public interface ConstantValue extends FeatureValue {
-	/**
-	 * Returns the value of the '<em><b>Value Instance</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value Instance</em>' containment reference isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Value Instance</em>' containment reference.
-	 * @see #setValueInstance(ValueSpecification)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getConstantValue_ValueInstance()
-	 * @model containment="true"
-	 * @generated
-	 */
-	ValueSpecification getValueInstance();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Value Instance</em>' containment reference.
-	 * @see #getValueInstance()
-	 * @generated
-	 */
-	void setValueInstance(ValueSpecification value);
-
-} // ConstantValue
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/DynamicValue.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/DynamicValue.java
deleted file mode 100644
index 0b214bd98ea..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/DynamicValue.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dynamic Value</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getDynamicValue()
- * @model abstract="true"
- * @generated
- */
-public interface DynamicValue extends FeatureValue {
-} // DynamicValue
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureToSet.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureToSet.java
deleted file mode 100644
index e4d6bf069bd..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureToSet.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Feature To Set</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureToSet()
- * @model
- * @generated
- */
-public interface FeatureToSet extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Feature Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Feature Name</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Feature Name</em>' attribute.
-	 * @see #setFeatureName(String)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureToSet_FeatureName()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getFeatureName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Feature Name</em>' attribute.
-	 * @see #getFeatureName()
-	 * @generated
-	 */
-	void setFeatureName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' containment reference isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Value</em>' containment reference.
-	 * @see #setValue(FeatureValue)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureToSet_Value()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	FeatureValue getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Value</em>' containment reference.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(FeatureValue value);
-
-} // FeatureToSet
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValue.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValue.java
deleted file mode 100644
index 470daf74016..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValue.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Feature Value</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getFeatureValue()
- * @model abstract="true"
- * @generated
- */
-public interface FeatureValue extends EObject {
-} // FeatureValue
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ListValue.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ListValue.java
deleted file mode 100644
index afde34caab7..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/ListValue.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>List Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue#getValues <em>Values</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getListValue()
- * @model
- * @generated
- */
-public interface ListValue extends FeatureValue {
-	/**
-	 * Returns the value of the '<em><b>Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Values</em>' containment reference list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Values</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getListValue_Values()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<FeatureValue> getValues();
-
-} // ListValue
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/QueryExecutionValue.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/QueryExecutionValue.java
deleted file mode 100644
index 8c08807fedc..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/QueryExecutionValue.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Query Execution Value</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getQueryExecutionValue()
- * @model
- * @generated
- */
-public interface QueryExecutionValue extends DynamicValue {
-} // QueryExecutionValue
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfiguration.java
deleted file mode 100644
index a10168d5315..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfiguration.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Set Values Action Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration#getFeaturesToSet <em>Features To Set</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getSetValuesActionConfiguration()
- * @model
- * @generated
- */
-public interface SetValuesActionConfiguration extends SemanticActionConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Features To Set</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Features To Set</em>' containment reference list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Features To Set</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#getSetValuesActionConfiguration_FeaturesToSet()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<FeatureToSet> getFeaturesToSet();
-
-} // SetValuesActionConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationFactory.java
deleted file mode 100644
index 86808d9bc0c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationFactory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage
- * @generated
- */
-public interface SetValuesActionConfigurationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	SetValuesActionConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Set Values Action Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Set Values Action Configuration</em>'.
-	 * @generated
-	 */
-	SetValuesActionConfiguration createSetValuesActionConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>Feature To Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Feature To Set</em>'.
-	 * @generated
-	 */
-	FeatureToSet createFeatureToSet();
-
-	/**
-	 * Returns a new object of class '<em>Constant Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Constant Value</em>'.
-	 * @generated
-	 */
-	ConstantValue createConstantValue();
-
-	/**
-	 * Returns a new object of class '<em>List Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>List Value</em>'.
-	 * @generated
-	 */
-	ListValue createListValue();
-
-	/**
-	 * Returns a new object of class '<em>Query Execution Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Query Execution Value</em>'.
-	 * @generated
-	 */
-	QueryExecutionValue createQueryExecutionValue();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	SetValuesActionConfigurationPackage getSetValuesActionConfigurationPackage();
-
-} // SetValuesActionConfigurationFactory
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationPackage.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationPackage.java
deleted file mode 100644
index e1df80f5eea..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationPackage.java
+++ /dev/null
@@ -1,587 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationFactory
- * @model kind="package"
- * @generated
- */
-public interface SetValuesActionConfigurationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNAME = "setvaluesactionconfiguration";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/emf/setvaluesaction/1.0";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_PREFIX = "setvaluesactionconfiguration";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	SetValuesActionConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl <em>Set Values Action Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getSetValuesActionConfiguration()
-	 * @generated
-	 */
-	int SET_VALUES_ACTION_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SET_VALUES_ACTION_CONFIGURATION__NAME = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SET_VALUES_ACTION_CONFIGURATION__DESCRIPTION = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SET_VALUES_ACTION_CONFIGURATION__IDENTIFIER = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SET_VALUES_ACTION_CONFIGURATION__ICON_ENTRY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__ICON_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Features To Set</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Set Values Action Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SET_VALUES_ACTION_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureToSet()
-	 * @generated
-	 */
-	int FEATURE_TO_SET = 1;
-
-	/**
-	 * The feature id for the '<em><b>Feature Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_TO_SET__FEATURE_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_TO_SET__VALUE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Feature To Set</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_TO_SET_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureValue()
-	 * @generated
-	 */
-	int FEATURE_VALUE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Feature Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_VALUE_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getDynamicValue()
-	 * @generated
-	 */
-	int DYNAMIC_VALUE = 3;
-
-	/**
-	 * The number of structural features of the '<em>Dynamic Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int DYNAMIC_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getConstantValue()
-	 * @generated
-	 */
-	int CONSTANT_VALUE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Value Instance</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTANT_VALUE__VALUE_INSTANCE = FEATURE_VALUE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Constant Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTANT_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getListValue()
-	 * @generated
-	 */
-	int LIST_VALUE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Values</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int LIST_VALUE__VALUES = FEATURE_VALUE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>List Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int LIST_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getQueryExecutionValue()
-	 * @generated
-	 */
-	int QUERY_EXECUTION_VALUE = 6;
-
-	/**
-	 * The number of structural features of the '<em>Query Execution Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_EXECUTION_VALUE_FEATURE_COUNT = DYNAMIC_VALUE_FEATURE_COUNT + 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration <em>Set Values Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Set Values Action Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration
-	 * @generated
-	 */
-	EClass getSetValuesActionConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration#getFeaturesToSet <em>Features To Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Features To Set</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration#getFeaturesToSet()
-	 * @see #getSetValuesActionConfiguration()
-	 * @generated
-	 */
-	EReference getSetValuesActionConfiguration_FeaturesToSet();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet <em>Feature To Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Feature To Set</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet
-	 * @generated
-	 */
-	EClass getFeatureToSet();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Feature Name</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getFeatureName()
-	 * @see #getFeatureToSet()
-	 * @generated
-	 */
-	EAttribute getFeatureToSet_FeatureName();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet#getValue()
-	 * @see #getFeatureToSet()
-	 * @generated
-	 */
-	EReference getFeatureToSet_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue <em>Feature Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Feature Value</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue
-	 * @generated
-	 */
-	EClass getFeatureValue();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue <em>Dynamic Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Dynamic Value</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue
-	 * @generated
-	 */
-	EClass getDynamicValue();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue <em>Constant Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Constant Value</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue
-	 * @generated
-	 */
-	EClass getConstantValue();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference '<em>Value Instance</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue#getValueInstance()
-	 * @see #getConstantValue()
-	 * @generated
-	 */
-	EReference getConstantValue_ValueInstance();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue <em>List Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>List Value</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue
-	 * @generated
-	 */
-	EClass getListValue();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue#getValues <em>Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Values</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue#getValues()
-	 * @see #getListValue()
-	 * @generated
-	 */
-	EReference getListValue_Values();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Query Execution Value</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue
-	 * @generated
-	 */
-	EClass getQueryExecutionValue();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	SetValuesActionConfigurationFactory getSetValuesActionConfigurationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 * <li>each class,</li>
-	 * <li>each feature of each class,</li>
-	 * <li>each enum,</li>
-	 * <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl <em>Set Values Action Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getSetValuesActionConfiguration()
-		 * @generated
-		 */
-		EClass SET_VALUES_ACTION_CONFIGURATION = eINSTANCE.getSetValuesActionConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Features To Set</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET = eINSTANCE.getSetValuesActionConfiguration_FeaturesToSet();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureToSet()
-		 * @generated
-		 */
-		EClass FEATURE_TO_SET = eINSTANCE.getFeatureToSet();
-
-		/**
-		 * The meta object literal for the '<em><b>Feature Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute FEATURE_TO_SET__FEATURE_NAME = eINSTANCE.getFeatureToSet_FeatureName();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference FEATURE_TO_SET__VALUE = eINSTANCE.getFeatureToSet_Value();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureValueImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getFeatureValue()
-		 * @generated
-		 */
-		EClass FEATURE_VALUE = eINSTANCE.getFeatureValue();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.DynamicValueImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getDynamicValue()
-		 * @generated
-		 */
-		EClass DYNAMIC_VALUE = eINSTANCE.getDynamicValue();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getConstantValue()
-		 * @generated
-		 */
-		EClass CONSTANT_VALUE = eINSTANCE.getConstantValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Value Instance</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference CONSTANT_VALUE__VALUE_INSTANCE = eINSTANCE.getConstantValue_ValueInstance();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getListValue()
-		 * @generated
-		 */
-		EClass LIST_VALUE = eINSTANCE.getListValue();
-
-		/**
-		 * The meta object literal for the '<em><b>Values</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference LIST_VALUE__VALUES = eINSTANCE.getListValue_Values();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.QueryExecutionValueImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationPackageImpl#getQueryExecutionValue()
-		 * @generated
-		 */
-		EClass QUERY_EXECUTION_VALUE = eINSTANCE.getQueryExecutionValue();
-
-	}
-
-} // SetValuesActionConfigurationPackage
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ConstantValueImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ConstantValueImpl.java
deleted file mode 100644
index bacbaf0464f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ConstantValueImpl.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constant Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue {
-	/**
-	 * The cached value of the '{@link #getValueInstance() <em>Value Instance</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getValueInstance()
-	 * @generated
-	 * @ordered
-	 */
-	protected ValueSpecification valueInstance;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ConstantValueImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SetValuesActionConfigurationPackage.Literals.CONSTANT_VALUE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ValueSpecification getValueInstance() {
-		return valueInstance;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public NotificationChain basicSetValueInstance(ValueSpecification newValueInstance, NotificationChain msgs) {
-		ValueSpecification oldValueInstance = valueInstance;
-		valueInstance = newValueInstance;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, oldValueInstance, newValueInstance);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setValueInstance(ValueSpecification newValueInstance) {
-		if (newValueInstance != valueInstance) {
-			NotificationChain msgs = null;
-			if (valueInstance != null) {
-				msgs = ((InternalEObject) valueInstance).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
-			}
-			if (newValueInstance != null) {
-				msgs = ((InternalEObject) newValueInstance).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
-			}
-			msgs = basicSetValueInstance(newValueInstance, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
-		}
-		else if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, newValueInstance, newValueInstance));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
-			return basicSetValueInstance(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
-			return getValueInstance();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
-			setValueInstance((ValueSpecification) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
-			setValueInstance((ValueSpecification) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
-			return valueInstance != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // ConstantValueImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/DynamicValueImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/DynamicValueImpl.java
deleted file mode 100644
index e881efc0926..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/DynamicValueImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dynamic Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class DynamicValueImpl extends FeatureValueImpl implements DynamicValue {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected DynamicValueImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SetValuesActionConfigurationPackage.Literals.DYNAMIC_VALUE;
-	}
-
-} // DynamicValueImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureToSetImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureToSetImpl.java
deleted file mode 100644
index bdc368de2ba..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureToSetImpl.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature To Set</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
-	/**
-	 * The default value of the '{@link #getFeatureName() <em>Feature Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getFeatureName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FEATURE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFeatureName() <em>Feature Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getFeatureName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String featureName = FEATURE_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureValue value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected FeatureToSetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SetValuesActionConfigurationPackage.Literals.FEATURE_TO_SET;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getFeatureName() {
-		return featureName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setFeatureName(String newFeatureName) {
-		String oldFeatureName = featureName;
-		featureName = newFeatureName;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME, oldFeatureName, featureName));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public FeatureValue getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public NotificationChain basicSetValue(FeatureValue newValue, NotificationChain msgs) {
-		FeatureValue oldValue = value;
-		value = newValue;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, oldValue, newValue);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setValue(FeatureValue newValue) {
-		if (newValue != value) {
-			NotificationChain msgs = null;
-			if (value != null) {
-				msgs = ((InternalEObject) value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);
-			}
-			if (newValue != null) {
-				msgs = ((InternalEObject) newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);
-			}
-			msgs = basicSetValue(newValue, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
-		}
-		else if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE, newValue, newValue));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:
-			return basicSetValue(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
-			return getFeatureName();
-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:
-			return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
-			setFeatureName((String) newValue);
-			return;
-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:
-			setValue((FeatureValue) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
-			setFeatureName(FEATURE_NAME_EDEFAULT);
-			return;
-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:
-			setValue((FeatureValue) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
-			return FEATURE_NAME_EDEFAULT == null ? featureName != null : !FEATURE_NAME_EDEFAULT.equals(featureName);
-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET__VALUE:
-			return value != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (featureName: ");
-		result.append(featureName);
-		result.append(')');
-		return result.toString();
-	}
-
-} // FeatureToSetImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureValueImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureValueImpl.java
deleted file mode 100644
index 10d08ef5cc4..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/FeatureValueImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class FeatureValueImpl extends EObjectImpl implements FeatureValue {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected FeatureValueImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SetValuesActionConfigurationPackage.Literals.FEATURE_VALUE;
-	}
-
-} // FeatureValueImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ListValueImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ListValueImpl.java
deleted file mode 100644
index eeddf921da0..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/ListValueImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>List Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.ListValueImpl#getValues <em>Values</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ListValueImpl extends FeatureValueImpl implements ListValue {
-	/**
-	 * The cached value of the '{@link #getValues() <em>Values</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getValues()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<FeatureValue> values;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ListValueImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SetValuesActionConfigurationPackage.Literals.LIST_VALUE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EList<FeatureValue> getValues() {
-		if (values == null) {
-			values = new EObjectContainmentEList<FeatureValue>(FeatureValue.class, this, SetValuesActionConfigurationPackage.LIST_VALUE__VALUES);
-		}
-		return values;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:
-			return ((InternalEList<?>) getValues()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:
-			return getValues();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:
-			getValues().clear();
-			getValues().addAll((Collection<? extends FeatureValue>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:
-			getValues().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.LIST_VALUE__VALUES:
-			return values != null && !values.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // ListValueImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/QueryExecutionValueImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/QueryExecutionValueImpl.java
deleted file mode 100644
index c1c15ed7dd8..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/QueryExecutionValueImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Query Execution Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class QueryExecutionValueImpl extends DynamicValueImpl implements QueryExecutionValue {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected QueryExecutionValueImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SetValuesActionConfigurationPackage.Literals.QUERY_EXECUTION_VALUE;
-	}
-
-} // QueryExecutionValueImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationFactoryImpl.java
deleted file mode 100644
index 8af9e56ec0e..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class SetValuesActionConfigurationFactoryImpl extends EFactoryImpl implements SetValuesActionConfigurationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static SetValuesActionConfigurationFactory init() {
-		try {
-			SetValuesActionConfigurationFactory theSetValuesActionConfigurationFactory = (SetValuesActionConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(SetValuesActionConfigurationPackage.eNS_URI);
-			if (theSetValuesActionConfigurationFactory != null) {
-				return theSetValuesActionConfigurationFactory;
-			}
-		} catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new SetValuesActionConfigurationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public SetValuesActionConfigurationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION:
-			return createSetValuesActionConfiguration();
-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET:
-			return createFeatureToSet();
-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE:
-			return createConstantValue();
-		case SetValuesActionConfigurationPackage.LIST_VALUE:
-			return createListValue();
-		case SetValuesActionConfigurationPackage.QUERY_EXECUTION_VALUE:
-			return createQueryExecutionValue();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public SetValuesActionConfiguration createSetValuesActionConfiguration() {
-		SetValuesActionConfigurationImpl setValuesActionConfiguration = new SetValuesActionConfigurationImpl();
-		return setValuesActionConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public FeatureToSet createFeatureToSet() {
-		FeatureToSetImpl featureToSet = new FeatureToSetImpl();
-		return featureToSet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ConstantValue createConstantValue() {
-		ConstantValueImpl constantValue = new ConstantValueImpl();
-		return constantValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ListValue createListValue() {
-		ListValueImpl listValue = new ListValueImpl();
-		return listValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public QueryExecutionValue createQueryExecutionValue() {
-		QueryExecutionValueImpl queryExecutionValue = new QueryExecutionValueImpl();
-		return queryExecutionValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public SetValuesActionConfigurationPackage getSetValuesActionConfigurationPackage() {
-		return (SetValuesActionConfigurationPackage) getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static SetValuesActionConfigurationPackage getPackage() {
-		return SetValuesActionConfigurationPackage.eINSTANCE;
-	}
-
-} // SetValuesActionConfigurationFactoryImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationImpl.java
deleted file mode 100644
index 08808fd9f1a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Set Values Action Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl.SetValuesActionConfigurationImpl#getFeaturesToSet <em>Features To Set</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SetValuesActionConfigurationImpl extends SemanticActionConfigurationImpl implements SetValuesActionConfiguration {
-	/**
-	 * The cached value of the '{@link #getFeaturesToSet() <em>Features To Set</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getFeaturesToSet()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<FeatureToSet> featuresToSet;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected SetValuesActionConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return SetValuesActionConfigurationPackage.Literals.SET_VALUES_ACTION_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EList<FeatureToSet> getFeaturesToSet() {
-		if (featuresToSet == null) {
-			featuresToSet = new EObjectContainmentEList<FeatureToSet>(FeatureToSet.class, this, SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET);
-		}
-		return featuresToSet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:
-			return ((InternalEList<?>) getFeaturesToSet()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:
-			return getFeaturesToSet();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:
-			getFeaturesToSet().clear();
-			getFeaturesToSet().addAll((Collection<? extends FeatureToSet>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:
-			getFeaturesToSet().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET:
-			return featuresToSet != null && !featuresToSet.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // SetValuesActionConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationPackageImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationPackageImpl.java
deleted file mode 100644
index 5fb3e088df9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/impl/SetValuesActionConfigurationPackageImpl.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class SetValuesActionConfigurationPackageImpl extends EPackageImpl implements SetValuesActionConfigurationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass setValuesActionConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass featureToSetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass featureValueEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass dynamicValueEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass constantValueEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass listValueEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass queryExecutionValueEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private SetValuesActionConfigurationPackageImpl() {
-		super(eNS_URI, SetValuesActionConfigurationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
-	 * <p>
-	 * This method is used to initialize {@link SetValuesActionConfigurationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 *
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static SetValuesActionConfigurationPackage init() {
-		if (isInited) {
-			return (SetValuesActionConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(SetValuesActionConfigurationPackage.eNS_URI);
-		}
-
-		// Obtain or create and register package
-		SetValuesActionConfigurationPackageImpl theSetValuesActionConfigurationPackage = (SetValuesActionConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SetValuesActionConfigurationPackageImpl ? EPackage.Registry.INSTANCE
-				.get(eNS_URI) : new SetValuesActionConfigurationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ExtendedtypesPackage.eINSTANCE.eClass();
-		UMLPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theSetValuesActionConfigurationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theSetValuesActionConfigurationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theSetValuesActionConfigurationPackage.freeze();
-
-
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(SetValuesActionConfigurationPackage.eNS_URI, theSetValuesActionConfigurationPackage);
-		return theSetValuesActionConfigurationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EClass getSetValuesActionConfiguration() {
-		return setValuesActionConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EReference getSetValuesActionConfiguration_FeaturesToSet() {
-		return (EReference) setValuesActionConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EClass getFeatureToSet() {
-		return featureToSetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EAttribute getFeatureToSet_FeatureName() {
-		return (EAttribute) featureToSetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EReference getFeatureToSet_Value() {
-		return (EReference) featureToSetEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EClass getFeatureValue() {
-		return featureValueEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EClass getDynamicValue() {
-		return dynamicValueEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EClass getConstantValue() {
-		return constantValueEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EReference getConstantValue_ValueInstance() {
-		return (EReference) constantValueEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EClass getListValue() {
-		return listValueEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EReference getListValue_Values() {
-		return (EReference) listValueEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EClass getQueryExecutionValue() {
-		return queryExecutionValueEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public SetValuesActionConfigurationFactory getSetValuesActionConfigurationFactory() {
-		return (SetValuesActionConfigurationFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package. This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) {
-			return;
-		}
-		isCreated = true;
-
-		// Create classes and their features
-		setValuesActionConfigurationEClass = createEClass(SET_VALUES_ACTION_CONFIGURATION);
-		createEReference(setValuesActionConfigurationEClass, SET_VALUES_ACTION_CONFIGURATION__FEATURES_TO_SET);
-
-		featureToSetEClass = createEClass(FEATURE_TO_SET);
-		createEAttribute(featureToSetEClass, FEATURE_TO_SET__FEATURE_NAME);
-		createEReference(featureToSetEClass, FEATURE_TO_SET__VALUE);
-
-		featureValueEClass = createEClass(FEATURE_VALUE);
-
-		dynamicValueEClass = createEClass(DYNAMIC_VALUE);
-
-		constantValueEClass = createEClass(CONSTANT_VALUE);
-		createEReference(constantValueEClass, CONSTANT_VALUE__VALUE_INSTANCE);
-
-		listValueEClass = createEClass(LIST_VALUE);
-		createEReference(listValueEClass, LIST_VALUE__VALUES);
-
-		queryExecutionValueEClass = createEClass(QUERY_EXECUTION_VALUE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model. This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) {
-			return;
-		}
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);
-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		setValuesActionConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getSemanticActionConfiguration());
-		dynamicValueEClass.getESuperTypes().add(this.getFeatureValue());
-		constantValueEClass.getESuperTypes().add(this.getFeatureValue());
-		listValueEClass.getESuperTypes().add(this.getFeatureValue());
-		queryExecutionValueEClass.getESuperTypes().add(this.getDynamicValue());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(setValuesActionConfigurationEClass, SetValuesActionConfiguration.class, "SetValuesActionConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSetValuesActionConfiguration_FeaturesToSet(), this.getFeatureToSet(), null, "featuresToSet", null, 0, -1, SetValuesActionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(featureToSetEClass, FeatureToSet.class, "FeatureToSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFeatureToSet_FeatureName(), theEcorePackage.getEString(), "featureName", null, 1, 1, FeatureToSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFeatureToSet_Value(), this.getFeatureValue(), null, "value", null, 1, 1, FeatureToSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(featureValueEClass, FeatureValue.class, "FeatureValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(dynamicValueEClass, DynamicValue.class, "DynamicValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(constantValueEClass, ConstantValue.class, "ConstantValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getConstantValue_ValueInstance(), theUMLPackage.getValueSpecification(), null, "valueInstance", null, 0, 1, ConstantValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-
-		initEClass(listValueEClass, ListValue.class, "ListValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getListValue_Values(), this.getFeatureValue(), null, "values", null, 0, -1, ListValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(queryExecutionValueEClass, QueryExecutionValue.class, "QueryExecutionValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} // SetValuesActionConfigurationPackageImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationAdapterFactory.java
deleted file mode 100644
index 6c6072ae37a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage
- * @generated
- */
-public class SetValuesActionConfigurationAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static SetValuesActionConfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public SetValuesActionConfigurationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = SetValuesActionConfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected SetValuesActionConfigurationSwitch<Adapter> modelSwitch =
-			new SetValuesActionConfigurationSwitch<Adapter>() {
-				@Override
-				public Adapter caseSetValuesActionConfiguration(SetValuesActionConfiguration object) {
-					return createSetValuesActionConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter caseFeatureToSet(FeatureToSet object) {
-					return createFeatureToSetAdapter();
-				}
-
-				@Override
-				public Adapter caseFeatureValue(FeatureValue object) {
-					return createFeatureValueAdapter();
-				}
-
-				@Override
-				public Adapter caseDynamicValue(DynamicValue object) {
-					return createDynamicValueAdapter();
-				}
-
-				@Override
-				public Adapter caseConstantValue(ConstantValue object) {
-					return createConstantValueAdapter();
-				}
-
-				@Override
-				public Adapter caseListValue(ListValue object) {
-					return createListValueAdapter();
-				}
-
-				@Override
-				public Adapter caseQueryExecutionValue(QueryExecutionValue object) {
-					return createQueryExecutionValueAdapter();
-				}
-
-				@Override
-				public Adapter caseConfigurationElement(ConfigurationElement object) {
-					return createConfigurationElementAdapter();
-				}
-
-				@Override
-				public Adapter caseActionConfiguration(ActionConfiguration object) {
-					return createActionConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter caseSemanticActionConfiguration(SemanticActionConfiguration object) {
-					return createSemanticActionConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter defaultCase(EObject object) {
-					return createEObjectAdapter();
-				}
-			};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param target
-	 *            the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration <em>Set Values Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration
-	 * @generated
-	 */
-	public Adapter createSetValuesActionConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet <em>Feature To Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet
-	 * @generated
-	 */
-	public Adapter createFeatureToSetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue <em>Feature Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue
-	 * @generated
-	 */
-	public Adapter createFeatureValueAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue <em>Dynamic Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue
-	 * @generated
-	 */
-	public Adapter createDynamicValueAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue <em>Constant Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue
-	 * @generated
-	 */
-	public Adapter createConstantValueAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue <em>List Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue
-	 * @generated
-	 */
-	public Adapter createListValueAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue
-	 * @generated
-	 */
-	public Adapter createQueryExecutionValueAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement
-	 * @generated
-	 */
-	public Adapter createConfigurationElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration
-	 * @generated
-	 */
-	public Adapter createActionConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration <em>Semantic Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration
-	 * @generated
-	 */
-	public Adapter createSemanticActionConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} // SetValuesActionConfigurationAdapterFactory
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceFactoryImpl.java
deleted file mode 100644
index d082cb6fce6..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationResourceImpl
- * @generated
- */
-public class SetValuesActionConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public SetValuesActionConfigurationResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Resource createResource(URI uri) {
-		XMLResource result = new SetValuesActionConfigurationResourceImpl(uri);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-		return result;
-	}
-
-} // SetValuesActionConfigurationResourceFactoryImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceImpl.java
deleted file mode 100644
index 2727090f2c2..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationResourceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationResourceFactoryImpl
- * @generated
- */
-public class SetValuesActionConfigurationResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param uri
-	 *            the URI of the new resource.
-	 * @generated
-	 */
-	public SetValuesActionConfigurationResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} // SetValuesActionConfigurationResourceImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationSwitch.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationSwitch.java
deleted file mode 100644
index dec3090a9ab..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationSwitch.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ConstantValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.DynamicValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureToSet;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.FeatureValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.ListValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.QueryExecutionValue;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage
- * @generated
- */
-public class SetValuesActionConfigurationSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static SetValuesActionConfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public SetValuesActionConfigurationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = SetValuesActionConfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case SetValuesActionConfigurationPackage.SET_VALUES_ACTION_CONFIGURATION: {
-			SetValuesActionConfiguration setValuesActionConfiguration = (SetValuesActionConfiguration) theEObject;
-			T result = caseSetValuesActionConfiguration(setValuesActionConfiguration);
-			if (result == null) {
-				result = caseSemanticActionConfiguration(setValuesActionConfiguration);
-			}
-			if (result == null) {
-				result = caseActionConfiguration(setValuesActionConfiguration);
-			}
-			if (result == null) {
-				result = caseConfigurationElement(setValuesActionConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case SetValuesActionConfigurationPackage.FEATURE_TO_SET: {
-			FeatureToSet featureToSet = (FeatureToSet) theEObject;
-			T result = caseFeatureToSet(featureToSet);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case SetValuesActionConfigurationPackage.FEATURE_VALUE: {
-			FeatureValue featureValue = (FeatureValue) theEObject;
-			T result = caseFeatureValue(featureValue);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case SetValuesActionConfigurationPackage.DYNAMIC_VALUE: {
-			DynamicValue dynamicValue = (DynamicValue) theEObject;
-			T result = caseDynamicValue(dynamicValue);
-			if (result == null) {
-				result = caseFeatureValue(dynamicValue);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case SetValuesActionConfigurationPackage.CONSTANT_VALUE: {
-			ConstantValue constantValue = (ConstantValue) theEObject;
-			T result = caseConstantValue(constantValue);
-			if (result == null) {
-				result = caseFeatureValue(constantValue);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case SetValuesActionConfigurationPackage.LIST_VALUE: {
-			ListValue listValue = (ListValue) theEObject;
-			T result = caseListValue(listValue);
-			if (result == null) {
-				result = caseFeatureValue(listValue);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case SetValuesActionConfigurationPackage.QUERY_EXECUTION_VALUE: {
-			QueryExecutionValue queryExecutionValue = (QueryExecutionValue) theEObject;
-			T result = caseQueryExecutionValue(queryExecutionValue);
-			if (result == null) {
-				result = caseDynamicValue(queryExecutionValue);
-			}
-			if (result == null) {
-				result = caseFeatureValue(queryExecutionValue);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Set Values Action Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Set Values Action Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSetValuesActionConfiguration(SetValuesActionConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Feature To Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Feature To Set</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFeatureToSet(FeatureToSet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Feature Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Feature Value</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFeatureValue(FeatureValue object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dynamic Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Dynamic Value</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDynamicValue(DynamicValue object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Constant Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Constant Value</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseConstantValue(ConstantValue object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>List Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>List Value</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseListValue(ListValue object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Query Execution Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Query Execution Value</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseQueryExecutionValue(QueryExecutionValue object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Configuration Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Configuration Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseConfigurationElement(ConfigurationElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Action Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Action Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseActionConfiguration(ActionConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Action Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Semantic Action Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSemanticActionConfiguration(SemanticActionConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} // SetValuesActionConfigurationSwitch
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationXMLProcessor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationXMLProcessor.java
deleted file mode 100644
index bc84fb6726a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src-gen/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/util/SetValuesActionConfigurationXMLProcessor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfigurationPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class SetValuesActionConfigurationXMLProcessor extends XMLProcessor {
-
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public SetValuesActionConfigurationXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		SetValuesActionConfigurationPackage.eINSTANCE.eClass();
-	}
-
-	/**
-	 * Register for "*" and "xml" file extensions the SetValuesActionConfigurationResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new SetValuesActionConfigurationResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new SetValuesActionConfigurationResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} // SetValuesActionConfigurationXMLProcessor
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/Activator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/Activator.java
deleted file mode 100644
index 7732e762f08..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/Activator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014, 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:
- *  Patrick Tessier (CEA LIST) - Initial API and implementation
- *  Christian W. Damus - bug 485220
- *  
- /*****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.extendedtypes.emf"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/** Logging helper */
-	public static LogHelper log;
-
-	/**
-	 * 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;
-		log = new LogHelper(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		log = null;
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterNotfoundException.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterNotfoundException.java
deleted file mode 100644
index 09ccf5237bc..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterNotfoundException.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
-
-import org.eclipse.uml2.uml.ValueSpecification;
-
-
-/**
- * Exception thrown when no converter was found
- */
-public class ConverterNotfoundException extends Exception {
-
-	/** serialization id */
-	private static final long serialVersionUID = -8863603362830475612L;
-
-	/** target parameter type */
-	private final Class<?> parameterType;
-
-	/** source value instance */
-	private final ValueSpecification valueInstance;
-
-	/**
-	 * Creates a new {@link ConverterNotfoundException}.
-	 *
-	 * @param parameterType
-	 *            the target type of the value
-	 * @param valueInstance
-	 *            the value specification defining the entering value and type
-	 */
-	public ConverterNotfoundException(Class<?> parameterType, ValueSpecification valueInstance) {
-		this.parameterType = parameterType;
-		this.valueInstance = valueInstance;
-	}
-
-	/**
-	 * Returns the target parameter type
-	 *
-	 * @return the target parameter type
-	 */
-	public Class<?> getParameterType() {
-		return parameterType;
-	}
-
-	/**
-	 * Returns the value specification defining the entering value and type
-	 *
-	 * @return the value specification defining the entering value and type
-	 */
-	public ValueSpecification getValueInstance() {
-		return valueInstance;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getMessage() {
-		return "Converter not found for target type: " + getParameterType() + " and for initial value: " + getValueInstance();
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java
deleted file mode 100644
index bdca51a8a42..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ConverterRegistry.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.databinding.conversion.IConverter;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.uml2.uml.Enumeration;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * Registry to store onverters.
- */
-public class ConverterRegistry {
-
-	/** singleton instance */
-	private static ConverterRegistry instance;
-
-	/** map to store converters, identified by their class */
-	private Map<Class<?>, IConverter> converterMaps = new HashMap<Class<?>, IConverter>();
-
-	/**
-	 * Constructor (not visible: singleton pattern)
-	 */
-	private ConverterRegistry() {
-	}
-
-	/**
-	 * Returns the single instance of this registry
-	 *
-	 * @return the single instance of this registry
-	 */
-	public static synchronized ConverterRegistry getSingleton() {
-		if (instance == null) {
-			instance = new ConverterRegistry();
-			instance.initializeRegistry();
-		}
-		return instance;
-	}
-
-	/**
-	 * Initialize the registry
-	 */
-	protected void initializeRegistry() {
-		converterMaps.put(String.class, new ValueSpecificationToStringConverter());
-		converterMaps.put(int.class, new ValueSpecificationToIntegerConverter());
-		converterMaps.put(boolean.class, new ValueSpecificationToBooleanConverter());
-		converterMaps.put(Enumeration.class, new ValueSpecificationToEnumerationConverter());
-		converterMaps.put(EEnum.class, new ValueSpecificationToEENumConverter());
-	}
-
-	/**
-	 * Returns the converter for the convenient type, from an {@link Object}
-	 *
-	 * @param toType
-	 *            the class into which the element should be transformed
-	 *
-	 * @return the converter for the convenient type
-	 */
-	public IConverter getConverter(Class<?> toType) {
-		return converterMaps.get(toType);
-	}
-
-	public Object convert(Class<?> parameterType, ValueSpecification valueInstance) throws ConverterNotfoundException {
-		// retrieve the converter
-		IConverter converter = getConverter(parameterType);
-
-		if (converter != null) {
-			return converter.convert(valueInstance);
-		} else {
-			throw new ConverterNotfoundException(parameterType, valueInstance);
-		}
-	}
-
-	// /**
-	// * Converts a parameter value into a list of values
-	// *
-	// * @param context
-	// * the context of the evaluation of the query
-	// * @param parameterType
-	// * the type of the list
-	// * @param parameterValue
-	// * the parameter value to transform into a list
-	// * @return the list of values contained by the parameter value
-	// */
-	// public List<?> convertToList(final EObject context, final Class<?> parameterType, final ParameterValue parameterValue) {
-	// return new ConfigurationSwitch<List<?>>() {
-	//
-	// /**
-	// * {@inheritDoc}
-	// */
-	// @Override
-	// public java.util.List<?> caseConstantParameterValue(ConstantParameterValue constantParameterValue) {
-	// IConverter converter = getConverter(parameterType);
-	//
-	// if(converter != null) {
-	// return Arrays.asList(converter.convert(constantParameterValue.getValueInstance()));
-	// } else {
-	// Activator.log.error("Impossible to find a converter for type: " + parameterType, null);
-	// return Collections.emptyList();
-	// }
-	// };
-	//
-	// /**
-	// * {@inheritDoc}
-	// */
-	// @Override
-	// public java.util.List<?> caseQueryExecutionValue(QueryExecutionValue queryExecutionValue) {
-	// // if query returns a list, returns it, else creates an array of one element
-	// QueryConfiguration queryConfiguration = queryExecutionValue.getConfiguration();
-	// if(!(queryConfiguration instanceof ModiscoQueryConfiguration)) {
-	// throw new RuntimeException("List conversion not implemented for this type of configuration. " + queryConfiguration.eClass().getName());
-	// }
-	// Object executionResult = null;
-	// try {
-	// executionResult = QueryUtil.evaluateBooleanQuery(context, queryConfiguration);
-	// } catch (Exception e) {
-	// Activator.log.error(e);
-	// }
-	// int upperBound = ((ModiscoQueryConfiguration)queryConfiguration).getQuery().getUpperBound();
-	// if(upperBound == 1) {
-	// return Arrays.asList(executionResult);
-	// } else {
-	// return (List<?>)executionResult;
-	// }
-	// };
-	//
-	// /**
-	// * {@inheritDoc}
-	// */
-	// @Override
-	// public java.util.List<?> caseListParameterValue(ListParameterValue listParameterValue) {
-	// List<Object> values = new ArrayList<Object>();
-	// for(ParameterValue parameterValue : listParameterValue.getValues()) {
-	// values.addAll(convertToList(context, parameterType, parameterValue));
-	// }
-	// return values;
-	// };
-	//
-	// }.doSwitch(parameterValue);
-	// }
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToBooleanConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToBooleanConverter.java
deleted file mode 100644
index 50bf410e853..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToBooleanConverter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-
-
-/**
- * Converter for Objects to Boolean value
- */
-public class ObjectToBooleanConverter extends Converter implements IConverter {
-
-	/**
-	 * Creates a new ObjectToBooleanConverter
-	 */
-	public ObjectToBooleanConverter() {
-		super(Object.class, Boolean.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Boolean convert(Object fromObject) {
-		if (fromObject == null) {
-			return null;
-		}
-
-		if (fromObject instanceof Boolean) {
-			return ((Boolean) fromObject);
-		}
-
-		if (fromObject instanceof String) {
-			return Boolean.valueOf((String) fromObject);
-		}
-
-		return null;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToIntegerConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToIntegerConverter.java
deleted file mode 100644
index e10febbdd80..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ObjectToIntegerConverter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-
-/**
- * Converter from an object to an integer
- */
-public class ObjectToIntegerConverter extends Converter implements IConverter {
-
-	/**
-	 * Default constructor.
-	 */
-	public ObjectToIntegerConverter() {
-		super(Object.class, Integer.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Integer convert(Object fromObject) {
-		if (fromObject == null) {
-			return null;
-		}
-
-		if (fromObject instanceof Integer) {
-			return (Integer) fromObject;
-		}
-
-		if (fromObject instanceof String) {
-			return Integer.parseInt((String) fromObject);
-		}
-
-		return null;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToBooleanConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToBooleanConverter.java
deleted file mode 100644
index c50b45f486f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToBooleanConverter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * Converter from a {@link ValueSpecification} to a {@link Boolean} value
- */
-public class ValueSpecificationToBooleanConverter extends Converter implements IConverter {
-
-	/**
-	 * Creates a new ValueSpecificationToBooleanConverter.
-	 */
-	public ValueSpecificationToBooleanConverter() {
-		super(ValueSpecification.class, boolean.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object convert(Object fromObject) {
-		return ((ValueSpecification) fromObject).booleanValue();
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEENumConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEENumConverter.java
deleted file mode 100644
index 62cf5cec095..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEENumConverter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.uml2.uml.EnumerationLiteral;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.InstanceValue;
-import org.eclipse.uml2.uml.ValueSpecification;
-import org.eclipse.uml2.uml.VisibilityKind;
-
-
-/**
- * @author RS211865
- */
-public class ValueSpecificationToEENumConverter extends Converter implements IConverter {
-
-	/**
-	 * @param fromType
-	 * @param toType
-	 */
-	public ValueSpecificationToEENumConverter() {
-		super(ValueSpecification.class, EEnum.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object convert(Object fromObject) {
-		if (fromObject instanceof InstanceValue) {
-			InstanceSpecification instanceSpecification = ((InstanceValue) fromObject).getInstance();
-			if (instanceSpecification instanceof EnumerationLiteral) {
-
-				System.err.println(VisibilityKind.PRIVATE_LITERAL);
-				Class<?> eclass = ((EnumerationLiteral) instanceSpecification).getEnumeration().eClass().getInstanceClass();
-				System.err.println(eclass.getEnumConstants());
-				System.err.println(eclass);
-
-
-
-
-
-				// final EEnumLiteral literal = eenum.getEEnumLiteral(umlLiteral.getName());
-				// if(literal != null) {
-				// return literal.getInstance();
-				// }
-				// return null;
-				//
-				System.err.println(instanceSpecification);
-
-
-				// return ((EnumerationLiteral)instanceSpecification).;
-			}
-		}
-
-		return fromObject;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEnumerationConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEnumerationConverter.java
deleted file mode 100644
index 1fd78d84420..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToEnumerationConverter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-import org.eclipse.uml2.uml.Enumeration;
-import org.eclipse.uml2.uml.EnumerationLiteral;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.InstanceValue;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-
-/**
- * Converter for enumeration values
- */
-public class ValueSpecificationToEnumerationConverter extends Converter implements IConverter {
-
-	/**
-	 * @param fromType
-	 * @param toType
-	 */
-	public ValueSpecificationToEnumerationConverter() {
-		super(ValueSpecification.class, Enumeration.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object convert(Object fromObject) {
-		if (fromObject instanceof InstanceValue) {
-			InstanceSpecification instanceSpecification = ((InstanceValue) fromObject).getInstance();
-			if (instanceSpecification instanceof EnumerationLiteral) {
-				return (instanceSpecification);
-			}
-		}
-
-		return fromObject;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToIntegerConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToIntegerConverter.java
deleted file mode 100644
index 98df4ae9388..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToIntegerConverter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * Converter from a {@link ValueSpecification} to an {@link Integer}.
- */
-public class ValueSpecificationToIntegerConverter extends Converter implements IConverter {
-
-	/**
-	 * Creates a new {@link ValueSpecificationToIntegerConverter}.
-	 */
-	public ValueSpecificationToIntegerConverter() {
-		super(ValueSpecification.class, int.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object convert(Object fromObject) {
-		return ((ValueSpecification) fromObject).integerValue();
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToStringConverter.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToStringConverter.java
deleted file mode 100644
index 1323d2233f9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/converter/ValueSpecificationToStringConverter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.converter;
-
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.conversion.IConverter;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * Converter from a {@link ValueSpecification} to an {@link String}.
- */
-public class ValueSpecificationToStringConverter extends Converter implements IConverter {
-
-	/**
-	 * Creates a new {@link ValueSpecificationToStringConverter}.
-	 */
-	public ValueSpecificationToStringConverter() {
-		super(ValueSpecification.class, String.class);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Object convert(Object fromObject) {
-		return ((ValueSpecification) fromObject).stringValue();
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValueUtils.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValueUtils.java
deleted file mode 100644
index c55ce0f15c2..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/FeatureValueUtils.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.infra.extendedtypes.Activator;
-import org.eclipse.papyrus.infra.extendedtypes.emf.converter.ConverterNotfoundException;
-import org.eclipse.papyrus.infra.extendedtypes.emf.converter.ConverterRegistry;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.util.SetValuesActionConfigurationSwitch;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.InstanceValue;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-
-/**
- * Utility class to get values from a {@link FeatureValue}
- */
-public class FeatureValueUtils {
-
-	protected FeatureValueUtils() {
-		// no instanciation, helper class
-	}
-
-	/**
-	 * Returns the value to set for a given feature of a given element
-	 *
-	 * @param elementToConfigure
-	 *            eobject for which feature is set. This must not be <code>null</code>
-	 * @param feature
-	 *            {@link EStructuralFeature} to set. This must not be <code>null</code>
-	 * @param valueModel
-	 *            configuration of the value, stored in the model
-	 * @return the real value that will be set to the object or <code>null</code> if none could be computed
-	 */
-	public static Object getValue(final EObject elementToConfigure, final EStructuralFeature feature, final FeatureValue featureValue) {
-
-		Object result = new SetValuesActionConfigurationSwitch<Object>() {
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			public Object caseConstantValue(ConstantValue object) {
-				ValueSpecification valueSpecification = object.getValueInstance();
-
-				if (valueSpecification == null) {
-					return null;
-				}
-
-				try {
-					EClassifier type = feature.getEType();
-					if (type instanceof EEnum) {
-						String value = ((InstanceValue) valueSpecification).getInstance().getName();
-						return ((EEnum) type).getEEnumLiteral(value).getInstance();
-						// return ConverterRegistry.getSingleton().convert(EEnum.class, valueSpecification);
-					} else if (type instanceof EDataType) {
-						final EDataType pType = (EDataType) type;
-						final String name = pType.getName();
-						if ("Boolean".equals(name)) {
-							return ConverterRegistry.getSingleton().convert(boolean.class, valueSpecification);
-						} else if ("Integer".equals(name)) {
-							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);
-						} else if ("Real".equals(name)) {
-							return ConverterRegistry.getSingleton().convert(double.class, valueSpecification);
-						} else if ("String".equals(name)) {
-							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
-						} else if ("UnlimitedNatural".equals(name)) {
-							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);
-						} else { // custom PrimitiveType
-							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
-						}
-					} else if (type instanceof DataType) {// FIXME manage the data type
-						return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
-					}
-					return ConverterRegistry.getSingleton().convert(feature.getEType().getInstanceClass(), valueSpecification);
-				} catch (ConverterNotfoundException e) {
-					Activator.log.error("Impossible to convert " + valueSpecification + " to fit feature type :" + feature, e);
-				}
-				return super.caseConstantValue(object);
-			}
-
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			public Object caseQueryExecutionValue(QueryExecutionValue object) {
-				throw new UnsupportedOperationException("Query execution values resolution has not been implemented yet");
-			};
-
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			public Object caseDynamicValue(DynamicValue object) {
-				throw new UnsupportedOperationException("Dynamic values resolution has not been implemented yet");
-			};
-
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			public Object caseListValue(ListValue object) {
-				// resolve one by one all features in the values list of this listvalue
-				List<Object> results = new ArrayList<Object>();
-				for (FeatureValue value : object.getValues()) {
-					Object singleResult = getValue(elementToConfigure, feature, value);
-					results.add(singleResult);
-				}
-				return results;
-			};
-
-		}.doSwitch(featureValue);
-		return result;
-	}
-
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationModelCreation.java
deleted file mode 100644
index 6d12242f591..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionConfigurationModelCreation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-import org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation;
-
-/**
- * {@link IActionConfigurationModelCreation} for {@link SetValuesActionConfiguration}
- */
-public class SetValuesActionConfigurationModelCreation implements IActionConfigurationModelCreation<SetValuesActionConfiguration> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public SetValuesActionConfiguration createConfigurationModel() {
-		return SetValuesActionConfigurationFactory.eINSTANCE.createSetValuesActionConfiguration();
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionCreationElementValidator.java
deleted file mode 100644
index d29eefca7ab..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionCreationElementValidator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator;
-import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;
-
-/**
- * {@link ICreationElementValidator} for {@link SetValuesActionConfiguration}
- */
-public class SetValuesActionCreationElementValidator implements IActionCreationElementValidator<SetValuesActionConfiguration> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean canCreate(CreateElementRequest request) {
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void init(SetValuesActionConfiguration configuration) {
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionEditHelperAdvice.java
deleted file mode 100644
index b15c8b417d9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/infra/extendedtypes/emf/setvaluesactionconfiguration/SetValuesActionEditHelperAdvice.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.infra.extendedtypes.IActionEditHelperAdvice;
-import org.eclipse.papyrus.infra.extendedtypes.emf.Activator;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-
-/**
- * advice for the {@link SetValuesActionConfiguration}
- */
-public class SetValuesActionEditHelperAdvice extends AbstractEditHelperAdvice implements IActionEditHelperAdvice<SetValuesActionConfiguration> {
-
-	/** list of the features to set */
-	// protected Map<String, FeatureValue> featuresToValues = null;
-	/** list of runtime defined features */
-	// protected Map<String, FeatureValue> featuresToRuntimeDefinitions = null;
-
-	/** list of static defined features */
-	protected Map<String, FeatureValue> featuresToStaticDefinitions = null;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void init(SetValuesActionConfiguration configuration) {
-		// featuresToRuntimeDefinitions = new HashMap<String, FeatureValue>();
-		featuresToStaticDefinitions = new HashMap<String, FeatureValue>();
-		if (configuration == null) {
-			return;
-		}
-		for (FeatureToSet featureToSet : configuration.getFeaturesToSet()) {
-			featuresToStaticDefinitions.put(featureToSet.getFeatureName(), featureToSet.getValue());
-		}
-	}
-
-	/**
-	 * Default Constructor
-	 */
-	public SetValuesActionEditHelperAdvice() {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		return super.approveRequest(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
-		return super.getBeforeCreateCommand(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
-		return super.getAfterCreateCommand(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
-		return super.getBeforeConfigureCommand(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
-		ICommand resultCommand = null;
-
-		// retrieve eobject
-		EObject elementToConfigure = request.getElementToConfigure();
-		if (elementToConfigure == null) {
-			return null;
-		}
-		// retrieve edit service to get features from configure command
-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(elementToConfigure);
-		if (service == null) {
-			Activator.log.error("Impossible to get edit service from element: " + elementToConfigure, null);
-			return null;
-		}
-
-		for (Entry<String, FeatureValue> featureEntry : featuresToStaticDefinitions.entrySet()) {
-			// retrieve feature value
-			ICommand command = getSetFeatureValueCommand(elementToConfigure, featureEntry.getKey(), featureEntry.getValue(), service, request);
-			if (command != null) {
-				if (resultCommand == null) {
-					resultCommand = command;
-				} else {
-					resultCommand = resultCommand.compose(command);
-				}
-			}
-		}
-
-		// if(!featuresToRuntimeDefinitions.isEmpty()) {
-		// ICommand command = getDynamicSetFeatureValueCommand(elementToConfigure, featuresToRuntimeDefinitions, service, request);
-		// if(command !=null) {
-		// if(resultCommand == null) {
-		// resultCommand = command;
-		// } else {
-		// resultCommand = resultCommand.compose(command);
-		// }
-		// }
-		// }
-
-
-		if (resultCommand != null) {
-			return resultCommand.reduce();
-		}
-
-
-		return super.getAfterConfigureCommand(request);
-	}
-
-
-	/**
-	 * @param elementToConfigure
-	 *            the eobject to configure
-	 * @param name
-	 *            the name of the feature to set
-	 * @param value
-	 *            the new value of the feature
-	 */
-	protected ICommand getSetFeatureValueCommand(EObject elementToConfigure, String name, FeatureValue featureValue, IElementEditService service, ConfigureRequest configureRequest) {
-		if (name == null) {
-			Activator.log.debug("No feature name has been set.");
-			return null;
-		}
-		if (elementToConfigure.eClass() == null) {
-			Activator.log.error("Impossible to find EClass from EObject: " + elementToConfigure, null);
-			return null;
-		}
-		// retrieve structural feature for the element to configure
-		EStructuralFeature feature = elementToConfigure.eClass().getEStructuralFeature(name);
-		if (feature == null) {
-			Activator.log.error("Impossible to find feature " + name + " for eobject " + elementToConfigure, null);
-			return null;
-		}
-		Object value = FeatureValueUtils.getValue(elementToConfigure, feature, featureValue);
-		SetRequest request = new SetRequest(elementToConfigure, feature, value);
-		// duplicate parameters from configure request?
-		request.addParameters(configureRequest.getParameters());
-		return service.getEditCommand(request);
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.classpath b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.classpath
deleted file mode 100644
index ad32c83a788..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.project
deleted file mode 100644
index 6a293ed41dc..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.extendedtypes.ui</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94d61f00da6..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.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.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
-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/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index fbcbe38f166..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.papyrus.infra.extendedtypes.internal.ui;x-internal:=true,
- org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice;x-internal:=true,
- org.eclipse.papyrus.infra.extendedtypes.internal.ui.handlers;x-internal:=true,
- org.eclipse.papyrus.infra.extendedtypes.internal.ui.preferences;x-internal:=true,
- org.eclipse.papyrus.infra.extendedtypes.ui.providers
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice"
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/about.html b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/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/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/build.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/build.properties
deleted file mode 100644
index 1995453f217..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#Mon Sep 12 09:29:52 CEST 2011
-output..=bin/
-bin.includes = .,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               icons/,\
-               schema/
-src.includes = about.html
-source.. = src/
-bin..=bin/
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/icons/configuration.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/icons/configuration.gif
deleted file mode 100644
index 0b1be97b8cf..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/icons/configuration.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/icons/error.gif b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/icons/error.gif
deleted file mode 100644
index 9b048d60532..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/icons/error.gif
+++ /dev/null
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.properties
deleted file mode 100644
index c2430244dbb..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.properties
+++ /dev/null
@@ -1,15 +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:
-#   CEA LIST - initial API and implementation
-#   Christian W. Damus - bug 485220
-# 
-###############################################################################
-pluginName = Papyrus ExtendedTypes UI
-providerName = Eclipse Modeling Project
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.xml
deleted file mode 100644
index 4b17ab28cce..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/plugin.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-   <extension-point id="extendedElementTypeActionProvider" name="Extended Element Type Action Provider" schema="schema/extendedElementTypeActionProvider.exsd"/>
-   
-    <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.aspectActionConfiguration">
-      <aspectAction
-            configurationClass="org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration"
-            configurationModelCreation="org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice.RuntimeValuesEditionActionConfigurationModelCreation"
-            creationElementValidator="org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice.RuntimeValuesEditionActionCreationElementValidator"
-            editHelperAdvice="org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice.RuntimeValuesEditionActionEditHelperAdvice">
-      </aspectAction>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-	    allPopups="false"
-	    locationURI="popup:org.eclipse.ui.popup.any?after=additions">
-		<command
-	       commandId="org.eclipse.papyrus.infra.extendedtypes.deploy"
-	       icon="icons/configuration.gif"
-	       style="push">
-		    <visibleWhen
-		          checkEnabled="false">
-		       <with
-		             variable="selection">
-		          <iterate
-		                ifEmpty="false"
-		                operator="and">
-		             <adapt
-		                   type="org.eclipse.core.resources.IFile">
-		                <or>
-		                   <test
-		                         property="org.eclipse.core.resources.extension"
-		                         value="extendedtypes">
-		                   </test>
-		                </or>
-		             </adapt>
-		          </iterate>
-		       </with>
-		    </visibleWhen>
-		</command>
-		 <command
-		       commandId="org.eclipse.papyrus.infra.extendedtypes.undeploy"
-		       icon="icons/configuration.gif"
-		       style="push">
-		    <visibleWhen
-		          checkEnabled="false">
-		       <with
-		             variable="selection">
-		          <iterate
-		                ifEmpty="false"
-		                operator="and">
-		             <adapt
-		                   type="org.eclipse.core.resources.IFile">
-		                <or>
-		                   <test
-		                         property="org.eclipse.core.resources.extension"
-		                         value="extendedtypes">
-		                   </test>
-		                </or>
-		             </adapt>
-		          </iterate>
-		       </with>
-		    </visibleWhen>
-		 </command>
-	</menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.eclipse.papyrus.infra.extendedtypes.internal.ui.handlers.DeployExtendedTypeSetConfigurationHandler"
-            id="org.eclipse.papyrus.infra.extendedtypes.deploy"
-            name="Deploy Extended Types Set configuration">
-      </command>
-      <command
-            defaultHandler="org.eclipse.papyrus.infra.extendedtypes.internal.ui.handlers.UndeployExtendedTypeSetConfigurationHandler"
-            id="org.eclipse.papyrus.infra.extendedtypes.undeploy"
-            name="Disable Extended Types Set configuration">
-      </command>
-   </extension>
-	
-   <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.userExtendedTypes">
-      <provider
-            class="org.eclipse.papyrus.infra.extendedtypes.internal.ui.UserExtendedTypesProvider">
-      </provider>
-   </extension>
-</plugin>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/pom.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/pom.xml
deleted file mode 100644
index 1c80d954045..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.infra-xtypes</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.extendedtypes.ui</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/schema/extendedElementTypeActionProvider.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/schema/extendedElementTypeActionProvider.exsd
deleted file mode 100644
index 54f98fd52ff..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/schema/extendedElementTypeActionProvider.exsd
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.extendedtypes.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.papyrus.infra.extendedtypes.ui" id="extendedElementTypeActionProvider" name="Extended ElementType Action Provider"/>
-      </appInfo>
-      <documentation>
-         This extension point provides the mechanism to add providers that create aspect actions on extended element types
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="extendedElementTypeActionProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="extendedElementTypeActionProvider">
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-         </sequence>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  name of this provider, used for example in menus
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  unique identifier for this provider
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  description of the behavior of this provider
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  Icon used when displaying this factory
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the class that implements the provider.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.providers.IExtendedElementTypeActionProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="configurationClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Class that describes the action configuration
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            The description for the priority of the palette provider
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  The priority of the provider. It can be one of the following values:
-[Lowest, Low, Medium, High, Highest]. Consideration of dependencies has to be done when choosing the priority. A provider that adds contributions to paths (menus | groups) contributed by other providers has to have a higher priority than them. Similarly, a provider that contributes palette entries that have been predefined by other providers has to have a higher priority than them.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="Lowest">
-                  </enumeration>
-                  <enumeration value="Low">
-                  </enumeration>
-                  <enumeration value="Medium">
-                  </enumeration>
-                  <enumeration value="High">
-                  </enumeration>
-                  <enumeration value="Highest">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         0.7.1
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         See this plugin for some examples
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiinfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         /*****************************************************************************
- * Copyright (c) 2010 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:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/LogUtil.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/LogUtil.java
deleted file mode 100644
index f8c60c10ede..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/LogUtil.java
+++ /dev/null
@@ -1,33 +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.infra.extendedtypes.internal.ui;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-
-/**
- * Logging utility.
- */
-public class LogUtil extends LogHelper {
-
-	public static final LogHelper LOG = new LogUtil();
-
-	/**
-	 * Not instantiable by clients.
-	 */
-	private LogUtil() {
-		super(Platform.getBundle("org.eclipse.papyrus.infra.extendedtypes.ui")); //$NON-NLS-1$
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/UserExtendedTypesProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/UserExtendedTypesProvider.java
deleted file mode 100644
index d3cef4a6cf9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/UserExtendedTypesProvider.java
+++ /dev/null
@@ -1,40 +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.infra.extendedtypes.internal.ui;
-
-import java.util.Map;
-
-import org.eclipse.papyrus.infra.extendedtypes.internal.spi.IUserExtendedTypesProvider;
-import org.eclipse.papyrus.infra.extendedtypes.internal.ui.preferences.ExtendedTypesPreferences;
-
-/**
- * User element-types definitions provider for compatibility with the 1.x releases.
- */
-public class UserExtendedTypesProvider implements IUserExtendedTypesProvider {
-
-	public UserExtendedTypesProvider() {
-		super();
-	}
-
-	@Override
-	public String getExtendedTypesRedefinition(String extendedTypesID) {
-		return ExtendedTypesPreferences.getExtendedTypesRedefinition(extendedTypesID);
-	}
-
-	@Override
-	public Map<String, String> getLocalExtendedTypesDefinitions() {
-		return ExtendedTypesPreferences.getLocalExtendedTypesDefinitions();
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionConfigurationModelCreation.java
deleted file mode 100644
index b73840bec65..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionConfigurationModelCreation.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice;
-
-import org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
-
-/**
- * {@link IActionConfigurationModelCreation} for {@link SetValuesActionConfiguration}
- */
-public class RuntimeValuesEditionActionConfigurationModelCreation implements IActionConfigurationModelCreation<RuntimeValuesEditionActionConfiguration> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public RuntimeValuesEditionActionConfiguration createConfigurationModel() {
-		return RuntimeValuesEditionActionConfigurationFactory.eINSTANCE.createRuntimeValuesEditionActionConfiguration();
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionCreationElementValidator.java
deleted file mode 100644
index 5935078c353..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionCreationElementValidator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice;
-
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator;
-import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
-
-/**
- * {@link ICreationElementValidator} for {@link SetValuesActionConfiguration}
- */
-public class RuntimeValuesEditionActionCreationElementValidator implements IActionCreationElementValidator<RuntimeValuesEditionActionConfiguration> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean canCreate(CreateElementRequest request) {
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void init(RuntimeValuesEditionActionConfiguration configuration) {
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionEditHelperAdvice.java
deleted file mode 100644
index bd4ee6fda36..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/advice/RuntimeValuesEditionActionEditHelperAdvice.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.internal.ui.advice;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.infra.extendedtypes.IActionEditHelperAdvice;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.RuntimeValuesEditionActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.emf.runtimevalueseditionactionconfiguration.ViewToDisplay;
-import org.eclipse.papyrus.infra.extendedtypes.emf.setvaluesactionconfiguration.SetValuesActionConfiguration;
-import org.eclipse.papyrus.infra.properties.contexts.View;
-import org.eclipse.papyrus.infra.properties.ui.creation.EditionDialog;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * advice for the {@link SetValuesActionConfiguration}
- */
-public class RuntimeValuesEditionActionEditHelperAdvice extends AbstractEditHelperAdvice implements IActionEditHelperAdvice<RuntimeValuesEditionActionConfiguration> {
-
-	/** list of views to display */
-	protected Set<View> viewsToDisplay;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void init(RuntimeValuesEditionActionConfiguration configuration) {
-		viewsToDisplay = new HashSet<View>();
-		for (ViewToDisplay display : configuration.getViewsToDisplay()) {
-			View view = display.getView();
-			if (view != null) {
-				viewsToDisplay.add(view);
-			}
-		}
-	}
-
-	/**
-	 * Default Constructor
-	 */
-	public RuntimeValuesEditionActionEditHelperAdvice() {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		return super.approveRequest(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
-		return super.getBeforeCreateCommand(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
-		return super.getAfterCreateCommand(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
-		return super.getBeforeConfigureCommand(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {
-		final EObject elementToConfigure = request.getElementToConfigure();
-		if (elementToConfigure == null) {
-			return null;
-		}
-
-		return new AbstractTransactionalCommand(request.getEditingDomain(), "Editing " + EMFCoreUtil.getName(elementToConfigure), Collections.singletonList(WorkspaceSynchronizer.getFile((elementToConfigure.eResource())))) {
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				Set<View> viewsToDisplay = getViewsToDisplay();
-				if (!viewsToDisplay.isEmpty()) {
-					EditionDialog dialog = new EditionDialog(Display.getCurrent().getActiveShell()) {
-
-					};
-					dialog.setTitle("Edit " + EMFCoreUtil.getName(elementToConfigure));
-					dialog.setViews(viewsToDisplay);
-					dialog.setInput(elementToConfigure);
-
-					dialog.open();
-				}
-
-				return CommandResult.newOKCommandResult(elementToConfigure);
-			}
-		};
-
-	}
-
-
-	/**
-	 * @return the viewsToDisplay
-	 */
-	public Set<View> getViewsToDisplay() {
-		return viewsToDisplay;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/DeployExtendedTypeSetConfigurationHandler.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/DeployExtendedTypeSetConfigurationHandler.java
deleted file mode 100644
index 99ab5404eeb..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/DeployExtendedTypeSetConfigurationHandler.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.internal.ui.handlers;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.extendedtypes.Activator;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSetRegistry;
-import org.eclipse.papyrus.infra.extendedtypes.internal.ui.preferences.ExtendedTypesPreferences;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.statushandlers.StatusManager;
-
-
-/**
- * Handler to deploy new configuration
- */
-public class DeployExtendedTypeSetConfigurationHandler extends AbstractHandler implements IHandler {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
-		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {
-			return null;
-		}
-
-		final IStructuredSelection selection = (IStructuredSelection) currentSelection;
-
-		final Shell activeShell = HandlerUtil.getActiveShell(event);
-
-		Job job = new Job("Deploy extended type set configuration") {
-
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				monitor.beginTask("Deploying selected configurations", selection.size());
-
-				return doExecute(selection, monitor);
-			}
-		};
-
-		job.addJobChangeListener(new JobChangeAdapter() {
-
-			@Override
-			public void done(final IJobChangeEvent event) {
-				activeShell.getDisplay().asyncExec(new Runnable() {
-
-					public void run() {
-						if (event.getResult().isOK()) {
-							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());
-						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged
-							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);
-						}
-					}
-				});
-			}
-		});
-
-		job.setUser(true);
-		job.schedule();
-
-		return null;
-	}
-
-	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {
-		Iterator<?> selectionIterator = selection.iterator();
-
-		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The properties view configuration has been successfully deployed and activated", null);
-
-		while (selectionIterator.hasNext()) {
-			Object selectedElement = selectionIterator.next();
-			if (selectedElement instanceof IAdaptable) {
-				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);
-				if (selectedFile == null) {
-					monitor.worked(1);
-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));
-					continue;
-				}
-
-
-				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();
-				monitor.subTask("Deploy " + fileName);
-
-				URI emfURI = null;
-				if (selectedFile.getFullPath() != null) {
-					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);
-				} else if (selectedFile.getRawLocation() != null) {
-					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());
-				}
-
-				if (emfURI == null) {
-					monitor.worked(1);
-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));
-					continue;
-				}
-
-				ExtendedTypesPreferences.registerWorkspaceDefinition(fileName, selectedFile.getFullPath().toString());
-
-				monitor.subTask("Reset Element Types Registry");
-				ExtendedElementTypeSetRegistry.getInstance().loadExtendedElementTypeSet(fileName);
-				monitor.worked(1);
-
-				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The extended types configuration has been successfully deployed and activated"));
-			}
-		}
-
-		if (result.getChildren().length == 1) {
-			return result.getChildren()[0];
-		} else { // Merge the result and specify an appropriate message based on the result
-			if (result.isOK()) {
-				return result;
-			} else {
-				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the deployment", result.getException());
-				actualResult.merge(result);
-				return actualResult;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/UndeployExtendedTypeSetConfigurationHandler.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/UndeployExtendedTypeSetConfigurationHandler.java
deleted file mode 100644
index 84dd1297d29..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/handlers/UndeployExtendedTypeSetConfigurationHandler.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.internal.ui.handlers;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.infra.extendedtypes.Activator;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSetRegistry;
-import org.eclipse.papyrus.infra.extendedtypes.internal.ui.preferences.ExtendedTypesPreferences;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.statushandlers.StatusManager;
-
-
-/**
- * @author RS211865
- */
-public class UndeployExtendedTypeSetConfigurationHandler extends AbstractHandler {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
-		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {
-			return null;
-		}
-
-		final IStructuredSelection selection = (IStructuredSelection) currentSelection;
-
-		final Shell activeShell = HandlerUtil.getActiveShell(event);
-
-		Job job = new Job("Undeploy extended type set configuration") {
-
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				monitor.beginTask("Undeploying selected configurations", selection.size());
-
-				return doExecute(selection, monitor);
-			}
-		};
-
-		job.addJobChangeListener(new JobChangeAdapter() {
-
-			@Override
-			public void done(final IJobChangeEvent event) {
-				activeShell.getDisplay().asyncExec(new Runnable() {
-
-					public void run() {
-						if (event.getResult().isOK()) {
-							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());
-						} else if (event.getResult().getSeverity() < IStatus.ERROR) { // Errors are already logged
-							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);
-						}
-					}
-				});
-			}
-		});
-
-		job.setUser(true);
-		job.schedule();
-
-		return null;
-	}
-
-	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {
-		Iterator<?> selectionIterator = selection.iterator();
-
-		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The extended types configuration has been successfully undeployed", null);
-
-		while (selectionIterator.hasNext()) {
-			Object selectedElement = selectionIterator.next();
-			if (selectedElement instanceof IAdaptable) {
-				IFile selectedFile = (IFile) ((IAdaptable) selectedElement).getAdapter(IFile.class);
-				if (selectedFile == null) {
-					monitor.worked(1);
-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));
-					continue;
-				}
-
-
-				String fileName = selectedFile.getFullPath().removeFileExtension().lastSegment();
-				monitor.subTask("Deploy " + fileName);
-
-				URI emfURI = null;
-				if (selectedFile.getFullPath() != null) {
-					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);
-				} else if (selectedFile.getRawLocation() != null) {
-					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());
-				}
-
-				if (emfURI == null) {
-					monitor.worked(1);
-					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid configuration file"));
-					continue;
-				}
-
-				ExtendedTypesPreferences.unregisterWorkspaceDefinition(fileName);
-
-				monitor.subTask("Reset Element Types Registry");
-				ExtendedElementTypeSetRegistry.getInstance().unload(fileName);
-				monitor.worked(1);
-
-				// relaunch papyrus service
-
-				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The extended types configuration has been successfully undeployed"));
-			}
-		}
-
-		if (result.getChildren().length == 1) {
-			return result.getChildren()[0];
-		} else { // Merge the result and specify an appropriate message based on the result
-			if (result.isOK()) {
-				return result;
-			} else {
-				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the undeployment", result.getException());
-				actualResult.merge(result);
-				return actualResult;
-			}
-		}
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/preferences/ExtendedTypesPreferences.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/preferences/ExtendedTypesPreferences.java
deleted file mode 100644
index eefd7b8f20e..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/internal/ui/preferences/ExtendedTypesPreferences.java
+++ /dev/null
@@ -1,306 +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 - bug 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.internal.ui.preferences;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.extendedtypes.internal.ui.LogUtil;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.WorkbenchException;
-import org.eclipse.ui.XMLMemento;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-
-/**
- * Preferences management for extended types
- */
-public class ExtendedTypesPreferences {
-
-	/** id for the preference store for extended types redefinitions */
-	public final static String EXTENDED_TYPES_REDEFINITIONS = "extendedTypesRedefinitions"; //$NON-NLS-1$
-
-	/** id for the node: extended types redefinition */
-	public final static String EXTENDED_TYPES_REDEFINITION = "extendedTypesRedefinition"; //$NON-NLS-1$
-
-	public static final String EXTENDED_TYPES_SET_WORKSPACE_DEFINITION = "extendedTypeSetsWorkspaceDefinition";
-
-	/** name of the ID attribute */
-	public final static String ID = "id"; //$NON-NLS-1$
-
-	/** name for the field giving the path to the XML file */
-	public final static String PATH = "path"; //$NON-NLS-1$
-
-	private static IPreferenceStore preferences;
-
-	/**
-	 * Returns the preference store used to store elementTypes preferences.
-	 *
-	 * @return the preference store of the plugin
-	 */
-	protected synchronized static IPreferenceStore getPreferenceStore() {
-		if (preferences == null) {
-			preferences = new ScopedPreferenceStore(InstanceScope.INSTANCE,
-					org.eclipse.papyrus.infra.extendedtypes.Activator.PLUGIN_ID);
-		}
-
-		return preferences;
-	}
-
-	/**
-	 * Retrieves the root memento from the plugin preferences for all extended types redefinition
-	 * redefinitions.
-	 *
-	 * @return the root memento if there were existing customizations, a newly created one otherwise (empty one)
-	 */
-	protected static XMLMemento getLocalRedefinitions() {
-		String sValue = getPreferenceStore().getString(EXTENDED_TYPES_REDEFINITIONS);
-		try {
-			if (sValue != null && !sValue.equals("")) { //$NON-NLS-1$
-				XMLMemento rootMemento = XMLMemento.createReadRoot(new StringReader(sValue));
-				return rootMemento;
-			} else {
-				return XMLMemento.createWriteRoot(EXTENDED_TYPES_REDEFINITIONS);
-			}
-		} catch (WorkbenchException e) {
-			LogUtil.LOG.error("Impossible to read preferences for extended types local redefinitions", e);
-		}
-		return null;
-	}
-
-	/**
-	 * Register a new local redefinition of a extendedTypes.
-	 *
-	 * @param extendedTypesID
-	 *            the id of the extendedTypes to register
-	 * @param path
-	 *            the path to the configuration of the extendedTypes
-	 * @return the memento that has been registered
-	 */
-	public static IMemento registerLocalRedefinition(String extendedTypesID, String path) {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		// try to find an existing local definition for this extendedTypes
-		IMemento memento = getExtendedTypesRedefinitionNode(extendedTypesID);
-		// if one exists, remove it from the preferences
-		if (memento != null) {
-			unregisterLocalRedefinition(extendedTypesID);
-		}
-		// then register the new one
-		IMemento newMemento = rootMemento.createChild(EXTENDED_TYPES_REDEFINITION);
-		newMemento.putString(ID, extendedTypesID);
-		newMemento.putString(PATH, path);
-		saveLocalRedefinitions(rootMemento);
-		return newMemento;
-	}
-
-	/**
-	 * Returns the memento associated to the extendedTypes, or <code>null</code> if none exists
-	 *
-	 * @param extendedTypesID
-	 *            the identifier of the extendedTypes to find
-	 * @return the memento found or <code>null</code> if no customization exists for this extendedTypes
-	 */
-	private static IMemento getExtendedTypesRedefinitionNode(String extendedTypesID) {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		IMemento[] redefinitions = rootMemento.getChildren(EXTENDED_TYPES_REDEFINITION);
-		for (IMemento redefinitionMemento : redefinitions) {
-			String extendedTypesNodeID = redefinitionMemento.getString(ID);
-			// check equals. extendedTypes ID is not null, as checked at the begining of the method.
-			if (extendedTypesID.equals(extendedTypesNodeID)) {
-				return redefinitionMemento;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the memento associated to the extendedTypes set definition in workspace, or <code>null</code> if none exists
-	 *
-	 * @return the memento found or <code>null</code> if no customization exists for this extendedTypes
-	 */
-	protected static IMemento[] getWorkspaceDefinitions() {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		IMemento[] workspaceDefinitions = rootMemento.getChildren(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION);
-		return workspaceDefinitions;
-	}
-
-	/**
-	 * Returns the memento associated to the extendedTypes set definition in workspace, or <code>null</code> if none exists
-	 *
-	 * @return the memento found or <code>null</code> if no customization exists for this extendedTypes
-	 */
-	protected static IMemento getWorkspaceDefinition(String extendedTypeSetsID) {
-		if (extendedTypeSetsID == null) {
-			return null;
-		}
-		IMemento[] workspaceDefinitions = getWorkspaceDefinitions();
-		if (workspaceDefinitions == null || workspaceDefinitions.length == 0) {
-			return null;
-		}
-		for (IMemento memento : workspaceDefinitions) {
-			String id = memento.getString(ID);
-			if (extendedTypeSetsID.equals(id)) {
-				return memento;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the path for a given extended type local redefinition
-	 *
-	 * @param extendedTypesID
-	 *            the unique identifier of the extended type to retrieve
-	 * @return the path to the configuration of the extended types or <code>null</code> if no customization exists for this extended type
-	 *         configuration
-	 */
-	public static String getExtendedTypesRedefinition(String extendedTypesID) {
-		if (extendedTypesID == null) {
-			LogUtil.LOG.debug("Trying to find preferences for a null extended type set identifier");
-		}
-		IMemento memento = getExtendedTypesRedefinitionNode(extendedTypesID);
-		if (memento != null) {
-			return memento.getString(PATH);
-		}
-		return null;
-	}
-
-	/**
-	 * Unregister a specific local redefinition
-	 *
-	 * @param extendedTypesID
-	 *            the identifier of the extended types set to unregister
-	 */
-	public static void unregisterLocalRedefinition(String extendedTypesID) {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		// no remove method...
-		// so, creation of a new root memento, then, duplicate all entries
-		// except the one to
-		// delete...
-		XMLMemento newRootMemento = XMLMemento.createWriteRoot(EXTENDED_TYPES_REDEFINITIONS);
-		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_REDEFINITION)) {
-			if (!memento.getString(ID).equals(extendedTypesID)) {
-				newRootMemento.putMemento(memento);
-			}
-		}
-		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION)) {
-			newRootMemento.putMemento(memento);
-		}
-		// save new Memento
-		saveLocalRedefinitions(newRootMemento);
-	}
-
-	/**
-	 * @param extendedTypesID
-	 */
-	public static void unregisterWorkspaceDefinition(String extendedTypesID) {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		// no remove method...
-		// so, creation of a new root memento, then, duplicate all entries
-		// except the one to
-		// delete...
-		XMLMemento newRootMemento = XMLMemento.createWriteRoot(EXTENDED_TYPES_REDEFINITIONS);
-		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_REDEFINITION)) {
-			newRootMemento.putMemento(memento);
-		}
-		for (IMemento memento : rootMemento.getChildren(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION)) {
-			if (!memento.getString(ID).equals(extendedTypesID)) {
-				newRootMemento.putMemento(memento);
-			}
-		}
-		// save new Memento
-		saveLocalRedefinitions(newRootMemento);
-	}
-
-	/**
-	 * saves the given root memento with the given key in the preference area
-	 *
-	 * @param xmlMemento
-	 *            the memento to save
-	 * @param key
-	 *            the key for the preference store
-	 */
-	private static void saveMemento(XMLMemento xmlMemento, String key) {
-		// save memento
-		StringWriter writer = new StringWriter();
-		try {
-			xmlMemento.save(writer);
-			if (getPreferenceStore() != null) {
-				getPreferenceStore().setValue(key, writer.toString());
-			}
-		} catch (IOException e) {
-			LogUtil.LOG.error("input/ouput exception", e);
-		}
-	}
-
-	/**
-	 * Saves the set of local redefinitions into the preference store
-	 *
-	 * @param rootMemento
-	 *            the memento to save
-	 */
-	public static void saveLocalRedefinitions(XMLMemento rootMemento) {
-		saveMemento(rootMemento, EXTENDED_TYPES_REDEFINITIONS);
-	}
-
-	/**
-	 * Returns all the paths in the workspace that should be an extended type set to load, with the id as a key
-	 *
-	 * @return
-	 */
-	public static Map<String, String> getLocalExtendedTypesDefinitions() {
-		IMemento[] mementos = getWorkspaceDefinitions();
-		if (mementos != null && mementos.length > 0) {
-			Map<String, String> idToPath = new HashMap<String, String>();
-			for (IMemento memento : mementos) {
-				String id = memento.getString(ID);
-				String path = memento.getString(PATH);
-				if (id != null && !"".equals(id) && path != null && !"".equals(PATH)) {
-					idToPath.put(id, path);
-				}
-			}
-			return idToPath;
-		}
-		return null;
-	}
-
-	/**
-	 * Register a new local redefinition of a extendedTypes.
-	 *
-	 * @param extendedTypesID
-	 *            the id of the extendedTypes to register
-	 * @param path
-	 *            the path to the configuration of the extendedTypes
-	 * @return the memento that has been registered
-	 */
-	public static IMemento registerWorkspaceDefinition(String extendedTypesID, String path) {
-		XMLMemento rootMemento = getLocalRedefinitions();
-		// try to find an existing local definition for this extendedTypes
-		IMemento memento = getWorkspaceDefinition(extendedTypesID);
-		// if one exists, remove it from the preferences
-		if (memento != null) {
-			unregisterWorkspaceDefinition(extendedTypesID);
-		}
-		// then register the new one
-		IMemento newMemento = rootMemento.createChild(EXTENDED_TYPES_SET_WORKSPACE_DEFINITION);
-		newMemento.putString(ID, extendedTypesID);
-		newMemento.putString(PATH, path);
-		saveLocalRedefinitions(rootMemento);
-		return newMemento;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtendedElementTypeActionService.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtendedElementTypeActionService.java
deleted file mode 100644
index 85dcdb77e92..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtendedElementTypeActionService.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.ui.providers;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.common.ui.services.util.ActivityFilterProviderDescriptor;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.Activator;
-
-
-/**
- * Service to retrieve the provider giving the command for a specific {@link ActionConfiguration}
- */
-public class ExtendedElementTypeActionService extends Service {
-
-	/** singleton instance of this service */
-	protected final static ExtendedElementTypeActionService instance = new ExtendedElementTypeActionService();
-
-	/**
-	 * initialize the service
-	 */
-	static {
-		instance.configureProviders(Activator.PLUGIN_ID, "extendedElementTypeActionProvider"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Default constructor.
-	 */
-	protected ExtendedElementTypeActionService() {
-
-	}
-
-	/**
-	 * Returns the singleton instance of this service
-	 *
-	 * @return the singleton instance of this service
-	 */
-	synchronized public static ExtendedElementTypeActionService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.core.service.Service#newProviderDescriptor(org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	@Override
-	protected Service.ProviderDescriptor newProviderDescriptor(IConfigurationElement element) {
-		return new ProviderDescriptor(element);
-	}
-
-	/**
-	 * Returns all providers in the service
-	 *
-	 * @return the list of providers found or an empty list.
-	 */
-	public List<IExtendedElementTypeActionProvider> getProviders() {
-		List<IExtendedElementTypeActionProvider> providers = new ArrayList<IExtendedElementTypeActionProvider>();
-		execute(ExecutionStrategy.REVERSE, new GetAllExtendedElementTypeActionProvidersOperation(providers));
-		return providers;
-	}
-
-	/**
-	 * Returns the provider with the given identifier
-	 *
-	 * @param actionConfiguration
-	 *            the actionConfiguration for the provider to retrieve
-	 * @return the provider found or <code>null</code>.
-	 */
-	public IExtendedElementTypeActionProvider getProvider(ActionConfiguration actionConfiguration) {
-		@SuppressWarnings({ "unchecked", "rawtypes" })
-		List<IExtendedElementTypeActionProvider> providers = execute(ExecutionStrategy.REVERSE, new GetExtendedElementTypeActionProviderOperation(actionConfiguration));
-		Iterator<IExtendedElementTypeActionProvider> it = providers.iterator();
-		while (it.hasNext()) {
-			IExtendedElementTypeActionProvider aspectActionProvider = it.next();
-			if (aspectActionProvider != null) {
-				return aspectActionProvider;
-			}
-		}
-		return null; // backward compatibility
-	}
-
-	/**
-	 * Returns the command for the given {@link ActionConfiguration}.
-	 *
-	 * @param elementsToEdit
-	 *            list of elements to edit
-	 *
-	 * @param configuration
-	 *            the configuration of the action
-	 * @return the {@link ICommand} configured by the parameter or <code>null</code>.
-	 * @throws ProviderNotFoundException
-	 *             exception thrown when the provider was not found for this configuration
-	 */
-	public ICommand getICommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration) throws ProviderNotFoundException {
-		IExtendedElementTypeActionProvider provider = getProvider(configuration);
-		if (provider != null) {
-			return provider.getICommand(elementsToEdit, configuration);
-		}
-		throw new ProviderNotFoundException(configuration);
-	}
-
-	/**
-	 * Returns the command for the given {@link ActionConfiguration}.
-	 *
-	 * @param elementsToEdit
-	 *            list of elements to edit
-	 *
-	 * @param configuration
-	 *            the configuration of the action
-	 * @return the {@link ICommand} configured by the parameter or <code>null</code>.
-	 * @throws ProviderNotFoundException
-	 *             exception thrown when the provider was not found for this configuration
-	 */
-	public ICommand getPreValidationCommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration) throws ProviderNotFoundException {
-		IExtendedElementTypeActionProvider provider = getProvider(configuration);
-		if (provider != null) {
-			return provider.getBeforeCreateValidationCommand(elementsToEdit, configuration);
-		}
-		throw new ProviderNotFoundException(configuration);
-	}
-
-	/**
-	 * A descriptor for aspect tool providers defined by a configuration element.
-	 */
-	protected static class ProviderDescriptor extends ActivityFilterProviderDescriptor {
-
-		/** the provider configuration parsed from XML */
-		protected ExtentedElementTypeActionProviderConfiguration providerConfiguration;
-
-		/**
-		 * Constructs a <code>ISemanticProvider</code> descriptor for
-		 * the specified configuration element.
-		 *
-		 * @param element
-		 *            The configuration element describing the provider.
-		 */
-		public ProviderDescriptor(IConfigurationElement element) {
-			super(element);
-			this.providerConfiguration = ExtentedElementTypeActionProviderConfiguration.parse(element);
-			Assert.isNotNull(providerConfiguration);
-		}
-
-		/**
-		 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-		 */
-		@Override
-		public boolean provides(IOperation operation) {
-			if (!super.provides(operation)) {
-				return false;
-			}
-			if (operation instanceof GetAllExtendedElementTypeActionProvidersOperation) {
-				return true;
-			}
-			if (operation instanceof GetExtendedElementTypeActionProviderOperation) {
-				String providerConfigurationClassName = providerConfiguration.getConfigurationClassName();
-				if (providerConfigurationClassName == null) {
-					Activator.log.error("Error during the parsing of the action configuration extension point", null);
-					return false;
-				}
-				String configurationClassName = ((GetExtendedElementTypeActionProviderOperation) operation).getActionConfiguration().eClass().getInstanceClassName();
-				return providerConfigurationClassName.equals(configurationClassName);
-			}
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.gmf.runtime.common.core.service.Service.ProviderDescriptor#getProvider()
-		 */
-		@Override
-		public IProvider getProvider() {
-			if (provider == null) {
-				IProvider newProvider = super.getProvider();
-				if (provider instanceof IExtendedElementTypeActionProvider) {
-					IExtendedElementTypeActionProvider defaultProvider = (IExtendedElementTypeActionProvider) newProvider;
-					defaultProvider.setConfiguration(getElement());
-				}
-				return newProvider;
-			}
-			return super.getProvider();
-		}
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtentedElementTypeActionProviderConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtentedElementTypeActionProviderConfiguration.java
deleted file mode 100644
index 752c6201469..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ExtentedElementTypeActionProviderConfiguration.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.ui.providers;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProviderConfiguration;
-
-/**
- * Provider configuration for the aspect tool factory extension point.
- */
-public class ExtentedElementTypeActionProviderConfiguration extends AbstractProviderConfiguration {
-
-	/** field for provider class name */
-	protected static final String CLASS = "class";
-
-	/** field for configuration class name */
-	private static final String CONFIGURATION_CLASS = "configurationClass";
-
-	/** class name of the provider */
-	protected final String className;
-
-	/** class name of the configuration */
-	private final String configurationClassName;
-
-	/**
-	 * Creates and builds a new provider contribution descriptor by parsing its configuration element.
-	 *
-	 * @param configElement
-	 *            A provider XML configuration element
-	 * @return A provider XML contribution descriptor
-	 */
-	public static ExtentedElementTypeActionProviderConfiguration parse(IConfigurationElement configElement) {
-		Assert.isNotNull(configElement, "null provider configuration element"); //$NON-NLS-1$
-		return new ExtentedElementTypeActionProviderConfiguration(configElement);
-	}
-
-	/**
-	 * Creates a new <code>ProviderContributionDescriptor</code> instance
-	 * by parsing its configuration element.
-	 *
-	 * @param configElement
-	 *            The provider XML configuration element
-	 */
-	protected ExtentedElementTypeActionProviderConfiguration(IConfigurationElement configElement) {
-		// retrieve only ID, to test if the factory is the right one before creating whole element
-		className = configElement.getAttribute(CLASS);
-		Assert.isNotNull(className, "impossible to get the class name for the provider");
-
-		configurationClassName = configElement.getAttribute(CONFIGURATION_CLASS);
-		Assert.isNotNull(className, "impossible to get the class name for the provider");
-	}
-
-
-	/**
-	 * Returns the class name of the provider configured by this configuration
-	 *
-	 * @return the id of the factory
-	 */
-	public String getClassName() {
-		return className;
-	}
-
-	/**
-	 * Name of the configuration class
-	 *
-	 * @return the configuration Class Name
-	 */
-	public String getConfigurationClassName() {
-		return configurationClassName;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetAllExtendedElementTypeActionProvidersOperation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetAllExtendedElementTypeActionProvidersOperation.java
deleted file mode 100644
index d337ddb5497..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetAllExtendedElementTypeActionProvidersOperation.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.ui.providers;
-
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-
-/**
- * Operation that returns all providers for the {@link ExtendedElementTypeActionService}.
- */
-public class GetAllExtendedElementTypeActionProvidersOperation implements IOperation {
-
-	/** list of providers to fill */
-	private final List<IExtendedElementTypeActionProvider> providers;
-
-	/**
-	 * Creates a new GetAllExtendedElementTypeActionProvidersOperation.
-	 *
-	 * @param providers
-	 *            the list of providers to fill
-	 */
-	public GetAllExtendedElementTypeActionProvidersOperation(List<IExtendedElementTypeActionProvider> providers) {
-		this.providers = providers;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object execute(IProvider provider) {
-		if (provider instanceof IExtendedElementTypeActionProvider) {
-			providers.add((IExtendedElementTypeActionProvider) provider);
-		}
-		return providers;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetExtendedElementTypeActionProviderOperation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetExtendedElementTypeActionProviderOperation.java
deleted file mode 100644
index 96c66787d69..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/GetExtendedElementTypeActionProviderOperation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.ui.providers;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-
-
-/**
- * Operation that returns the first provider with given id
- */
-public class GetExtendedElementTypeActionProviderOperation implements IOperation {
-
-	/** action configuration for the provider to find */
-	private final ActionConfiguration actionConfiguration;
-
-	/**
-	 * Creates a new {@link GetExtendedElementTypeActionProviderOperation}.
-	 *
-	 * @param actionConfiguration
-	 *            action configuration for the provider to find
-	 */
-	public GetExtendedElementTypeActionProviderOperation(ActionConfiguration actionConfiguration) {
-		this.actionConfiguration = actionConfiguration;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Object execute(IProvider provider) {
-		return provider;
-	}
-
-	/**
-	 * Returns the action configuration for this operation
-	 *
-	 * @return the action configuration for this operation
-	 */
-	public ActionConfiguration getActionConfiguration() {
-		return actionConfiguration;
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/IExtendedElementTypeActionProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/IExtendedElementTypeActionProvider.java
deleted file mode 100644
index 3f835e93559..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/IExtendedElementTypeActionProvider.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.ui.providers;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-
-
-/**
- * Provider for extended element types action
- */
-public interface IExtendedElementTypeActionProvider extends IProvider {
-
-	/**
-	 * Returns the command to execute for the given configuration
-	 *
-	 * @param elementsToEdit
-	 *            list of elements to edit
-	 *
-	 * @param configuration
-	 *            the configuration for the command
-	 *
-	 * @return the command to execute for the given configuration
-	 */
-	public ICommand getICommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration);
-
-	/**
-	 * Returns the command to execute for the given configuration to check if it will be executable
-	 *
-	 * @param elementsToEdit
-	 *            list of elements to edit
-	 *
-	 * @param configuration
-	 *            the configuration for the command
-	 *
-	 * @return the command to execute for the given configuration. should do nothing on the model (either null or identity command), only return an
-	 *         Unexecutable command if creation is not allowed
-	 */
-	public ICommand getBeforeCreateValidationCommand(List<? extends Object> elementsToEdit, ActionConfiguration configuration);
-
-	/**
-	 * Sets the configuration for this provider, given the configuration element
-	 *
-	 * @param element
-	 *            the element that configures this provider
-	 */
-	public void setConfiguration(IConfigurationElement element);
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ProviderNotFoundException.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ProviderNotFoundException.java
deleted file mode 100644
index 5d3657a2b55..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes.ui/src/org/eclipse/papyrus/infra/extendedtypes/ui/providers/ProviderNotFoundException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.ui.providers;
-
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-
-
-/**
- * Exception thrown when a provider was not found
- */
-public class ProviderNotFoundException extends Exception {
-
-	/** serial UID */
-	private static final long serialVersionUID = 8919294410894098831L;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param configuration
-	 *            the configuration for which a provider was searched
-	 *
-	 */
-	public ProviderNotFoundException(ActionConfiguration configuration) {
-		super();
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.classpath b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.classpath
deleted file mode 100644
index 50aae142c50..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.project b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.project
deleted file mode 100644
index 211d9c88923..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.extendedtypes</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.core.resources.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 9743ce0e106..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Mar 24 15:06:10 CET 2011
-eclipse.preferences.version=1
-encoding//model/ExtendedTypes.ecore=UTF-8
-encoding//model/ExtendedTypes.ecorediag=UTF-8
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b3aa6d60f94..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.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.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
-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/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.pde.api.tools.prefs b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
deleted file mode 100644
index 418c1603512..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.services.edit;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.papyrus.infra.extendedtypes,
- org.eclipse.papyrus.infra.extendedtypes.advices,
- org.eclipse.papyrus.infra.extendedtypes.impl,
- org.eclipse.papyrus.infra.extendedtypes.internal.spi;x-friends:="org.eclipse.papyrus.infra.extendedtypes.ui",
- org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration,
- org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl,
- org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util,
- org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration,
- org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl,
- org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util,
- org.eclipse.papyrus.infra.extendedtypes.semantic,
- org.eclipse.papyrus.infra.extendedtypes.types,
- org.eclipse.papyrus.infra.extendedtypes.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/about.html b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/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/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/build.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/build.properties
deleted file mode 100644
index 9e8f4164078..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#Mon Sep 12 09:29:52 CEST 2011
-output..=bin/
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               schema/,\
-               about.html
-jars.compile.order=.
-src.includes = about.html
-source.. = src-gen/,\
-           src/
-bin..=bin/
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore
deleted file mode 100644
index b3605b58449..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="extendedtypes" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"
-    nsPrefix="extendedtypes">
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedElementTypeSet" eSuperTypes="#//ConfigurationElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementType" lowerBound="1"
-        upperBound="-1" eType="#//ElementTypeConfiguration" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extensible" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeConfiguration" abstract="true"
-      eSuperTypes="#//ConfigurationElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="ExtendedElements"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kindName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="org.eclipse.gmf.runtime.emf.type.core.IHintedType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedTypesID" lowerBound="1"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//MatcherConfiguration"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IconEntry">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundleId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConfigurationElement" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
-        eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="iconEntry" eType="#//IconEntry"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MatcherConfiguration" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ActionConfiguration" abstract="true"
-      eSuperTypes="#//ConfigurationElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ViewActionConfiguration" abstract="true"
-      eSuperTypes="#//ActionConfiguration"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SemanticActionConfiguration" abstract="true"
-      eSuperTypes="#//ActionConfiguration"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SemanticTypeConfiguration" abstract="true"
-      eSuperTypes="#//ElementTypeConfiguration">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Configuration specific to element types registered to manipulate Domain Specific elements."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ViewTypeConfiguration" abstract="true"
-      eSuperTypes="#//ElementTypeConfiguration">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Configuration specific to element types registered to manipulate graphical elements in GMF diagrams"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedDiagramTypeID"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeAdviceConfiguration" abstract="true"
-      eSuperTypes="#//ConfigurationElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AspectSemanticTypeConfiguration" eSuperTypes="#//SemanticTypeConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="actionConfiguration" upperBound="-1"
-        eType="#//SemanticActionConfiguration" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AspectViewTypeConfiguration" eSuperTypes="#//ViewTypeConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="actionConfiguration" upperBound="-1"
-        eType="#//ViewActionConfiguration" containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecorediag b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecorediag
deleted file mode 100644
index dec7c8e072b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecorediag
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram 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" xmi:id="_pHTPAOAjEd-0CYOJPs0ewQ" type="EcoreTools" name="ExtendedTypes" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_AtZG0OA1Ed-0CYOJPs0ewQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_Ati30OA1Ed-0CYOJPs0ewQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_Ati30eA1Ed-0CYOJPs0ewQ" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_hEerQF21EeOaP_1Gowzb-Q" type="2001">
-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ExtendedElementTypeSet/extensible"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_hEerQV21EeOaP_1Gowzb-Q"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ati30uA1Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ati30-A1Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ati31OA1Ed-0CYOJPs0ewQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Ati31eA1Ed-0CYOJPs0ewQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Ati31uA1Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Ati31-A1Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Ati32OA1Ed-0CYOJPs0ewQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_AtZG0eA1Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="8905185" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ExtendedElementTypeSet"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AtZG0uA1Ed-0CYOJPs0ewQ" x="730" y="215" width="263" height="123"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_D22yIOA1Ed-0CYOJPs0ewQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_D22yI-A1Ed-0CYOJPs0ewQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_D22yJOA1Ed-0CYOJPs0ewQ" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_yKWz0OA3Ed-0CYOJPs0ewQ" type="2001">
-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ElementTypeConfiguration/kindName"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_yKWz0eA3Ed-0CYOJPs0ewQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_qw89UOA3Ed-0CYOJPs0ewQ" type="2001">
-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ElementTypeConfiguration/hint"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qw89UeA3Ed-0CYOJPs0ewQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_4DzTcOA3Ed-0CYOJPs0ewQ" type="2001">
-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ElementTypeConfiguration/specializedTypesID"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_4DzTceA3Ed-0CYOJPs0ewQ"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_D22yJeA1Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_D22yJuA1Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_D22yJ-A1Ed-0CYOJPs0ewQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_D22yKOA1Ed-0CYOJPs0ewQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_D22yKeA1Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_D22yKuA1Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_D22yK-A1Ed-0CYOJPs0ewQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_D22yIeA1Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="8905185" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ElementTypeConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D22yIuA1Ed-0CYOJPs0ewQ" x="1130" y="215" width="243" height="123"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_RFg54OA3Ed-0CYOJPs0ewQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_RFg54-A3Ed-0CYOJPs0ewQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_RFg55OA3Ed-0CYOJPs0ewQ" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_U2KhAOA3Ed-0CYOJPs0ewQ" type="2001">
-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//IconEntry/iconPath"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_U2KhAeA3Ed-0CYOJPs0ewQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_TW8xAOA3Ed-0CYOJPs0ewQ" type="2001">
-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//IconEntry/bundleId"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TW8xAeA3Ed-0CYOJPs0ewQ"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_RFg55eA3Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_RFg55uA3Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_RFg55-A3Ed-0CYOJPs0ewQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_RFg56OA3Ed-0CYOJPs0ewQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_RFg56eA3Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_RFg56uA3Ed-0CYOJPs0ewQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_RFg56-A3Ed-0CYOJPs0ewQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_RFg54eA3Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10" fillColor="8905185" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//IconEntry"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RFg54uA3Ed-0CYOJPs0ewQ" x="685" y="35" width="243" height="103"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_vF928FaMEeOnIbrN_mmRsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_vGD9kFaMEeOnIbrN_mmRsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_vGFLsFaMEeOnIbrN_mmRsw" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_xXoXkFaMEeOnIbrN_mmRsw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ConfigurationElement/name"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xXoXkVaMEeOnIbrN_mmRsw"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="__vM6EFaMEeOnIbrN_mmRsw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ConfigurationElement/identifier"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__vM6EVaMEeOnIbrN_mmRsw"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_59WQMFaMEeOnIbrN_mmRsw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ConfigurationElement/description"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_59WQMVaMEeOnIbrN_mmRsw"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_vGFLsVaMEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_vGFLslaMEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vGFLs1aMEeOnIbrN_mmRsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_vGHA4FaMEeOnIbrN_mmRsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_vGHA4VaMEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_vGHA4laMEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vGHA41aMEeOnIbrN_mmRsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_vF928VaMEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12632256" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ConfigurationElement"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vF928laMEeOnIbrN_mmRsw" x="295" y="35" width="243" height="103"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_BqvHwFaPEeOnIbrN_mmRsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_Bq6G4FaPEeOnIbrN_mmRsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_Bq7VAFaPEeOnIbrN_mmRsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Bq7VAVaPEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Bq7VAlaPEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Bq7VA1aPEeOnIbrN_mmRsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Bq78EFaPEeOnIbrN_mmRsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Bq78EVaPEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Bq8jIFaPEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Bq8jIVaPEeOnIbrN_mmRsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_BqvHwVaPEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12632256" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//MatcherConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BqvHwlaPEeOnIbrN_mmRsw" x="1570" y="215" width="243" height="113"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="__MkT0FacEeOnIbrN_mmRsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="__MmwEFacEeOnIbrN_mmRsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="__MnXIFacEeOnIbrN_mmRsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="__MnXIVacEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="__MnXIlacEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="__MnXI1acEeOnIbrN_mmRsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="__MolQFacEeOnIbrN_mmRsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="__MolQVacEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="__MolQlacEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="__MolQ1acEeOnIbrN_mmRsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="__Mk64FacEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12632256" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ActionConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Mk64VacEeOnIbrN_mmRsw" x="110" y="225" width="223" height="113"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_HlSSQFadEeOnIbrN_mmRsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_HlUHcFadEeOnIbrN_mmRsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_HlVVkFadEeOnIbrN_mmRsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_HlVVkVadEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_HlVVkladEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_HlVVk1adEeOnIbrN_mmRsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_HlV8oFadEeOnIbrN_mmRsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_HlV8oVadEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_HlV8oladEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_HlV8o1adEeOnIbrN_mmRsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_HlSSQVadEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8905185" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ViewActionConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HlSSQladEeOnIbrN_mmRsw" x="55" y="770" width="183" height="117"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_NL1rEFadEeOnIbrN_mmRsw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_NL3gQFadEeOnIbrN_mmRsw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_NL4uYFadEeOnIbrN_mmRsw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NL4uYVadEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_NL4uYladEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NL4uY1adEeOnIbrN_mmRsw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_NL58gFadEeOnIbrN_mmRsw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_NL58gVadEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_NL58gladEeOnIbrN_mmRsw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_NL58g1adEeOnIbrN_mmRsw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_NL2SIFadEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8905185" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//SemanticActionConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NL2SIVadEeOnIbrN_mmRsw" x="240" y="535" width="203" height="168"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_gQ6R4Fd2EeOMz7r5xDmlGQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_gRAYgFd2EeOMz7r5xDmlGQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_gRC0wFd2EeOMz7r5xDmlGQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_gRC0wVd2EeOMz7r5xDmlGQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_gRC0wld2EeOMz7r5xDmlGQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_gRC0w1d2EeOMz7r5xDmlGQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_gRFRAFd2EeOMz7r5xDmlGQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_gRFRAVd2EeOMz7r5xDmlGQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_gRFRAld2EeOMz7r5xDmlGQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_gRFRA1d2EeOMz7r5xDmlGQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_gQ6R4Vd2EeOMz7r5xDmlGQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//SemanticTypeConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gQ6R4ld2EeOMz7r5xDmlGQ" x="990" y="395" width="243" height="113"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_r2M6AFd2EeOMz7r5xDmlGQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_r2PWQFd2EeOMz7r5xDmlGQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_r2P9UFd2EeOMz7r5xDmlGQ" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_u04IYIiaEeGlC_7TvaBunA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="ExtendedTypes.ecore#//ViewTypeConfiguration/specializedDiagramTypeID"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_u04IYYiaEeGlC_7TvaBunA"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_r2P9UVd2EeOMz7r5xDmlGQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_r2P9Uld2EeOMz7r5xDmlGQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_r2P9U1d2EeOMz7r5xDmlGQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_r2RLcFd2EeOMz7r5xDmlGQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_r2RLcVd2EeOMz7r5xDmlGQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_r2RLcld2EeOMz7r5xDmlGQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_r2RLc1d2EeOMz7r5xDmlGQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_r2M6AVd2EeOMz7r5xDmlGQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ViewTypeConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r2M6Ald2EeOMz7r5xDmlGQ" x="1270" y="395" width="303" height="113"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_LZtoMFg0EeOZc_L6ctfnzA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_LZu2UFg0EeOZc_L6ctfnzA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_LZvdYFg0EeOZc_L6ctfnzA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_LZvdYVg0EeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_LZvdYlg0EeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_LZvdY1g0EeOZc_L6ctfnzA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_LZwEcFg0EeOZc_L6ctfnzA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_LZwEcVg0EeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_LZwEclg0EeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_LZwEc1g0EeOZc_L6ctfnzA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_LZtoMVg0EeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ElementTypeAdviceConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LZtoMlg0EeOZc_L6ctfnzA" x="413" y="215" width="243" height="122"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_JtQagIHCEeOIquxre78irQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_Jtg5MIHCEeOIquxre78irQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_JtiuYIHCEeOIquxre78irQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_JtiuYYHCEeOIquxre78irQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JtiuYoHCEeOIquxre78irQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JtiuY4HCEeOIquxre78irQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_JtkjkIHCEeOIquxre78irQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_JtkjkYHCEeOIquxre78irQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JtkjkoHCEeOIquxre78irQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Jtkjk4HCEeOIquxre78irQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_JtQagYHCEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//AspectSemanticTypeConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JtQagoHCEeOIquxre78irQ" x="990" y="590" width="238" height="112"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_uzyBMIHCEeOIquxre78irQ" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_uz25sIHCEeOIquxre78irQ" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_uz3gwIHCEeOIquxre78irQ" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_uz3gwYHCEeOIquxre78irQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_uz3gwoHCEeOIquxre78irQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_uz3gw4HCEeOIquxre78irQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_uz4H0IHCEeOIquxre78irQ" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_uz4H0YHCEeOIquxre78irQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_uz4H0oHCEeOIquxre78irQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_uz4H04HCEeOIquxre78irQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_uzyBMYHCEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//AspectViewTypeConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uzyBMoHCEeOIquxre78irQ" x="1275" y="585" width="303" height="318"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_pHTPAeAjEd-0CYOJPs0ewQ"/>
-  <element xmi:type="ecore:EPackage" href="ExtendedTypes.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_GOjCQOA1Ed-0CYOJPs0ewQ" type="3002" source="_AtZG0OA1Ed-0CYOJPs0ewQ" target="_D22yIOA1Ed-0CYOJPs0ewQ">
-    <children xmi:type="notation:Node" xmi:id="_GOjCROA1Ed-0CYOJPs0ewQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_GOjCReA1Ed-0CYOJPs0ewQ" x="-19" y="-11"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_GOjCRuA1Ed-0CYOJPs0ewQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_GOjCR-A1Ed-0CYOJPs0ewQ" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_GOjCQeA1Ed-0CYOJPs0ewQ" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_GOjCQuA1Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//ExtendedElementTypeSet/elementType"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GOjCQ-A1Ed-0CYOJPs0ewQ" points="[142, -7, -321, 17]$[343, -9, -120, 15]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MaUoAOA1Ed-0CYOJPs0ewQ" id="(0.993006993006993,0.4152542372881356)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_al4SUOA2Ed-0CYOJPs0ewQ" id="(0.0076045627376425855,0.40707964601769914)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Y42TUOA3Ed-0CYOJPs0ewQ" type="3002" source="_vF928FaMEeOnIbrN_mmRsw" target="_RFg54OA3Ed-0CYOJPs0ewQ">
-    <children xmi:type="notation:Node" xmi:id="_Y5AEUOA3Ed-0CYOJPs0ewQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5AEUeA3Ed-0CYOJPs0ewQ" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Y5AEUuA3Ed-0CYOJPs0ewQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5AEU-A3Ed-0CYOJPs0ewQ" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Y42TUeA3Ed-0CYOJPs0ewQ" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Y42TUuA3Ed-0CYOJPs0ewQ" fontColor="4210752" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//ConfigurationElement/iconEntry"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y42TU-A3Ed-0CYOJPs0ewQ" points="[42, 1, -207, 5]$[317, 23, 68, 27]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y5AEVOA3Ed-0CYOJPs0ewQ" id="(0.9781931464174455,0.5274725274725275)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_PWwdwFaNEeOnIbrN_mmRsw" type="3003" source="_AtZG0OA1Ed-0CYOJPs0ewQ" target="_vF928FaMEeOnIbrN_mmRsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_PWwdwVaNEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_PWwdwlaNEeOnIbrN_mmRsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PWwdw1aNEeOnIbrN_mmRsw" points="[-29, -4, 477, 85]$[-29, -45, 477, 44]$[-470, -45, 36, 44]$[-470, -83, 36, 6]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PW3LcFaNEeOnIbrN_mmRsw" id="(0.5944055944055944,0.033707865168539325)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QoA_YFaPEeOnIbrN_mmRsw" id="(0.34890965732087226,0.945054945054945)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_P5L1YFaNEeOnIbrN_mmRsw" type="3003" source="_D22yIOA1Ed-0CYOJPs0ewQ" target="_vF928FaMEeOnIbrN_mmRsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_P5L1YVaNEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_P5MccFaNEeOnIbrN_mmRsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P5MccVaNEeOnIbrN_mmRsw" points="[-41, -1, 794, 130]$[-41, -42, 794, 89]$[-834, -42, 1, 89]$[-834, -80, 1, 51]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P5U_UFaNEeOnIbrN_mmRsw" id="(0.49794238683127573,0.016260162601626018)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_4W5vcFaPEeOnIbrN_mmRsw" type="3002" source="_D22yIOA1Ed-0CYOJPs0ewQ" target="_BqvHwFaPEeOnIbrN_mmRsw">
-    <children xmi:type="notation:Node" xmi:id="_4W69kFaPEeOnIbrN_mmRsw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4W69kVaPEeOnIbrN_mmRsw" x="-42" y="-11"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_4W7koFaPEeOnIbrN_mmRsw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4W8LsFaPEeOnIbrN_mmRsw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_4W5vcVaPEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_4W5vclaPEeOnIbrN_mmRsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//ElementTypeConfiguration/matcherConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4W5vc1aPEeOnIbrN_mmRsw" points="[27, -29, -434, 31]$[226, -29, -235, 31]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XCSUFaPEeOnIbrN_mmRsw" id="(0.8888888888888888,0.8292682926829268)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4XCSUVaPEeOnIbrN_mmRsw" id="(0.9762845849802372,0.3655913978494624)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_E94LIFadEeOnIbrN_mmRsw" type="3003" source="__MkT0FacEeOnIbrN_mmRsw" target="_vF928FaMEeOnIbrN_mmRsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_E94LIVadEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_E94LIladEeOnIbrN_mmRsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_E94LI1adEeOnIbrN_mmRsw" points="[54, -9, -92, 106]$[54, -59, -92, 56]$[206, -59, 60, 56]$[206, -98, 60, 17]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E971gFadEeOnIbrN_mmRsw" id="(0.45493562231759654,0.08433734939759036)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_E98ckFadEeOnIbrN_mmRsw" id="(0.25691699604743085,0.8349514563106796)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_cxGvwFadEeOnIbrN_mmRsw" type="3003" source="_HlSSQFadEeOnIbrN_mmRsw" target="__MkT0FacEeOnIbrN_mmRsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_cxGvwVadEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_cxGvwladEeOnIbrN_mmRsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cxGvw1adEeOnIbrN_mmRsw" points="[3, -4, -80, 443]$[3, -329, -80, 118]$[73, -329, -10, 118]$[73, -438, -10, 9]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cxLBMFadEeOnIbrN_mmRsw" id="(0.5081967213114754,0.04225352112676056)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eZwIkFadEeOnIbrN_mmRsw" id="(0.5407725321888412,0.927710843373494)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_f0YTgFadEeOnIbrN_mmRsw" type="3003" source="_NL1rEFadEeOnIbrN_mmRsw" target="__MkT0FacEeOnIbrN_mmRsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_f0YTgVadEeOnIbrN_mmRsw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_f0YTgladEeOnIbrN_mmRsw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f0YTg1adEeOnIbrN_mmRsw" points="[-3, -14, 212, 210]$[-3, -104, 212, 120]$[-119, -104, 96, 120]$[-119, -213, 96, 11]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f0ck8FadEeOnIbrN_mmRsw" id="(0.4918032786885246,0.08641975308641975)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f03x4IHCEeOIquxre78irQ" id="(0.06278026905829596,0.9026548672566371)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_0TGN0Fd2EeOMz7r5xDmlGQ" type="3003" source="_gQ6R4Fd2EeOMz7r5xDmlGQ" target="_D22yIOA1Ed-0CYOJPs0ewQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_0TGN0Vd2EeOMz7r5xDmlGQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_0TGN0ld2EeOMz7r5xDmlGQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0TGN01d2EeOMz7r5xDmlGQ" points="[16, -13, -144, 89]$[16, -43, -144, 59]$[156, -43, -4, 59]$[156, -72, -4, 30]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0TP-0Fd2EeOMz7r5xDmlGQ" id="(0.43209876543209874,0.12389380530973451)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0TP-0Vd2EeOMz7r5xDmlGQ" id="(0.5185185185185185,0.7560975609756098)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_02Dw8Fd2EeOMz7r5xDmlGQ" type="3003" source="_r2M6AFd2EeOMz7r5xDmlGQ" target="_D22yIOA1Ed-0CYOJPs0ewQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_02Dw8Vd2EeOMz7r5xDmlGQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_02Dw8ld2EeOMz7r5xDmlGQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02Dw81d2EeOMz7r5xDmlGQ" points="[2, -19, 189, 82]$[2, -49, 189, 52]$[-168, -49, 19, 52]$[-168, -78, 19, 23]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_02JQgFd2EeOMz7r5xDmlGQ" id="(0.49201277955271566,0.17699115044247787)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_02J3kFd2EeOMz7r5xDmlGQ" id="(0.41975308641975306,0.8130081300813008)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_IzApwFeGEeOMz7r5xDmlGQ" type="3003" source="_LZtoMFg0EeOZc_L6ctfnzA" target="_vF928FaMEeOnIbrN_mmRsw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_IzApwVeGEeOMz7r5xDmlGQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_IzApwleGEeOMz7r5xDmlGQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IzApw1eGEeOMz7r5xDmlGQ" points="[67, -20, 149, 130]$[67, -61, 149, 89]$[-81, -61, 1, 89]$[-81, -99, 1, 51]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IzE7MFeGEeOMz7r5xDmlGQ" id="(0.3497942386831276,0.17117117117117117)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_J2f2EIHCEeOIquxre78irQ" type="3003" source="_JtQagIHCEeOIquxre78irQ" target="_gQ6R4Fd2EeOMz7r5xDmlGQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_J2f2EYHCEeOIquxre78irQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_J2f2EoHCEeOIquxre78irQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J2f2E4HCEeOIquxre78irQ" points="[6, -55, 4, 140]$[6, -139, 4, 56]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_KRcFoIHCEeOIquxre78irQ" type="3002" source="_JtQagIHCEeOIquxre78irQ" target="_NL1rEFadEeOnIbrN_mmRsw">
-    <children xmi:type="notation:Node" xmi:id="_KRcssIHCEeOIquxre78irQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KRcssYHCEeOIquxre78irQ" x="-8" y="15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_KRdTwIHCEeOIquxre78irQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KRdTwYHCEeOIquxre78irQ" x="41" y="-16"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_KRcFoYHCEeOIquxre78irQ" routing="Rectilinear" closestDistance="true" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KRcFooHCEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//AspectSemanticTypeConfiguration/actionConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KRcFo4HCEeOIquxre78irQ" points="[-4, 1, 650, -20]$[-279, 1, 375, -20]$[-279, 17, 375, -4]$[-553, 17, 101, -4]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iWwf0IHCEeOIquxre78irQ" id="(0.0546218487394958,0.2857142857142857)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_ypPP0IHCEeOIquxre78irQ" type="3003" source="_uzyBMIHCEeOIquxre78irQ" target="_r2M6AFd2EeOMz7r5xDmlGQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ypPP0YHCEeOIquxre78irQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_ypPP0oHCEeOIquxre78irQ" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ypPP04HCEeOIquxre78irQ" points="[-10, -7, 7, 135]$[-10, -86, 7, 56]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ypSTIIHCEeOIquxre78irQ" id="(0.5412541254125413,0.06837606837606838)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_OivtUIHDEeOIquxre78irQ" type="3002" source="_uzyBMIHCEeOIquxre78irQ" target="_HlSSQFadEeOnIbrN_mmRsw">
-    <children xmi:type="notation:Node" xmi:id="_OiwUYIHDEeOIquxre78irQ" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OiwUYYHDEeOIquxre78irQ" x="85" y="-18"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_OiwUYoHDEeOIquxre78irQ" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OiwUY4HDEeOIquxre78irQ" x="133" y="17"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_OivtUYHDEeOIquxre78irQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_OivtUoHDEeOIquxre78irQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="ExtendedTypes.ecore#//AspectViewTypeConfiguration/actionConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OivtU4HDEeOIquxre78irQ" points="[-28, -29, 1097, -10]$[-1067, -29, 58, -10]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Oi1M4IHDEeOIquxre78irQ" id="(0.14521452145214522,0.6446540880503144)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Oi1M4YHDEeOIquxre78irQ" id="(0.6830601092896175,0.17937219730941703)"/>
-  </edges>
-</notation:Diagram>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel
deleted file mode 100644
index a69abb53eea..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.infra.extendedtypes/src-gen" creationSubmenus="true"
-    editDirectory="/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.infra.extendedtypes" modelName="ExtendedTypes"
-    nonNLSMarkers="true" codeFormatting="true" commentFormatting="true" testsDirectory="/org.eclipse.papyrus.infra.extendedtypes.tests/src-gen"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    language="" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
-    importOrganizing="true">
-  <foreignModel>ExtendedTypes.ecore</foreignModel>
-  <genPackages prefix="Extendedtypes" basePackage="org.eclipse.papyrus.infra" resource="XML"
-      disposableProviderFactory="true" literalsInterface="false" contentTypeIdentifier=""
-      ecorePackage="ExtendedTypes.ecore#/">
-    <genClasses ecoreClass="ExtendedTypes.ecore#//ExtendedElementTypeSet">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ExtendedTypes.ecore#//ExtendedElementTypeSet/elementType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ExtendedTypes.ecore#//ExtendedElementTypeSet/extensible"/>
-    </genClasses>
-    <genClasses ecoreClass="ExtendedTypes.ecore#//ElementTypeConfiguration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ExtendedTypes.ecore#//ElementTypeConfiguration/hint"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ExtendedTypes.ecore#//ElementTypeConfiguration/kindName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ExtendedTypes.ecore#//ElementTypeConfiguration/specializedTypesID"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ExtendedTypes.ecore#//ElementTypeConfiguration/matcherConfiguration"/>
-    </genClasses>
-    <genClasses ecoreClass="ExtendedTypes.ecore#//IconEntry">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ExtendedTypes.ecore#//IconEntry/iconPath"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ExtendedTypes.ecore#//IconEntry/bundleId"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="ExtendedTypes.ecore#//ConfigurationElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ExtendedTypes.ecore#//ConfigurationElement/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ExtendedTypes.ecore#//ConfigurationElement/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ExtendedTypes.ecore#//ConfigurationElement/identifier"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ExtendedTypes.ecore#//ConfigurationElement/iconEntry"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="ExtendedTypes.ecore#//MatcherConfiguration"/>
-    <genClasses image="false" ecoreClass="ExtendedTypes.ecore#//ActionConfiguration"/>
-    <genClasses image="false" ecoreClass="ExtendedTypes.ecore#//ViewActionConfiguration"/>
-    <genClasses image="false" ecoreClass="ExtendedTypes.ecore#//SemanticActionConfiguration"/>
-    <genClasses image="false" ecoreClass="ExtendedTypes.ecore#//SemanticTypeConfiguration"/>
-    <genClasses image="false" ecoreClass="ExtendedTypes.ecore#//ViewTypeConfiguration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ExtendedTypes.ecore#//ViewTypeConfiguration/specializedDiagramTypeID"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="ExtendedTypes.ecore#//ElementTypeAdviceConfiguration"/>
-    <genClasses ecoreClass="ExtendedTypes.ecore#//AspectSemanticTypeConfiguration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ExtendedTypes.ecore#//AspectSemanticTypeConfiguration/actionConfiguration"/>
-    </genClasses>
-    <genClasses ecoreClass="ExtendedTypes.ecore#//AspectViewTypeConfiguration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ExtendedTypes.ecore#//AspectViewTypeConfiguration/actionConfiguration"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecore b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecore
deleted file mode 100644
index c11a512b311..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecore
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="invariantcontainerconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0"
-    nsPrefix="invariantcontainerconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="InvariantContainerConfiguration" eSuperTypes="InvariantSemanticTypeConfiguration.ecore#//InvariantRuleConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="permissions" upperBound="-1"
-        eType="#//HierarchyPermission" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="HierarchyPermission">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="childType" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isPermitted" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isStrict" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecorediag b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecorediag
deleted file mode 100644
index a7d36d4e800..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.ecorediag
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram 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" xmi:id="_JJiHkFgvEeOZc_L6ctfnzA" type="EcoreTools" name="InvariantContainerConfiguration" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_cp6W8FgvEeOZc_L6ctfnzA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_cp6-AFgvEeOZc_L6ctfnzA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_cp7lEFgvEeOZc_L6ctfnzA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_cp7lEVgvEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_cp7lElgvEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_cp7lE1gvEeOZc_L6ctfnzA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_cp7lFFgvEeOZc_L6ctfnzA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_cp7lFVgvEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_cp7lFlgvEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_cp7lF1gvEeOZc_L6ctfnzA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_cp6W8VgvEeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="InvariantContainerConfiguration.ecore#//InvariantContainerConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cp6W8lgvEeOZc_L6ctfnzA" x="180" y="300" width="323" height="121"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_5pS3YFgvEeOZc_L6ctfnzA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_5pYW8FgvEeOZc_L6ctfnzA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_5pY-AFgvEeOZc_L6ctfnzA" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_KmuB0FgwEeOZc_L6ctfnzA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="InvariantContainerConfiguration.ecore#//HierarchyPermission/childType"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Kmuo4FgwEeOZc_L6ctfnzA"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_NU4RMFgwEeOZc_L6ctfnzA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="InvariantContainerConfiguration.ecore#//HierarchyPermission/isPermitted"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_NU4RMVgwEeOZc_L6ctfnzA"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_-vzskGQUEeOl5OaKZvi8pw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="InvariantContainerConfiguration.ecore#//HierarchyPermission/isStrict"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-vzskWQUEeOl5OaKZvi8pw"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_5pY-AVgvEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_5pY-AlgvEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_5pY-A1gvEeOZc_L6ctfnzA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_5pY-BFgvEeOZc_L6ctfnzA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_5pZlEFgvEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_5pZlEVgvEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_5pZlElgvEeOZc_L6ctfnzA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_5pS3YVgvEeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="InvariantContainerConfiguration.ecore#//HierarchyPermission"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pS3YlgvEeOZc_L6ctfnzA" x="700" y="300" width="323" height="121"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_kiU48Fz2EeO809zwjpcRug" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ksvZMFz2EeO809zwjpcRug" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ksvZMVz2EeO809zwjpcRug" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_kinz4Fz2EeO809zwjpcRug" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_kinz4Vz2EeO809zwjpcRug" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kinz4lz2EeO809zwjpcRug"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_kinz41z2EeO809zwjpcRug"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kinz5Fz2EeO809zwjpcRug"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_kinz5Vz2EeO809zwjpcRug" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_kinz5lz2EeO809zwjpcRug"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_kinz51z2EeO809zwjpcRug"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_kinz6Fz2EeO809zwjpcRug"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_kiU48Vz2EeO809zwjpcRug" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//ConfigurationElement"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kiU48lz2EeO809zwjpcRug" x="740" y="59" width="218" height="126"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_aIUqMGESEeOnIp9uJgA5yw" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aUuugGESEeOnIp9uJgA5yw" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aUuugWESEeOnIp9uJgA5yw" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_aIXtgGESEeOnIp9uJgA5yw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_aIY7oGESEeOnIp9uJgA5yw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_aIY7oWESEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_aIY7omESEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_aIY7o2ESEeOnIp9uJgA5yw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_aIb-8GESEeOnIp9uJgA5yw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_aIb-8WESEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_aIb-8mESEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_aIb-82ESEeOnIp9uJgA5yw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_aIUqMWESEeOnIp9uJgA5yw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="InvariantSemanticTypeConfiguration.ecore#//InvariantRuleConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aIUqMmESEeOnIp9uJgA5yw" x="205" y="100" width="273"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_JJiHkVgvEeOZc_L6ctfnzA"/>
-  <element xmi:type="ecore:EPackage" href="InvariantContainerConfiguration.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_9G9REFgvEeOZc_L6ctfnzA" type="3002" source="_cp6W8FgvEeOZc_L6ctfnzA" target="_5pS3YFgvEeOZc_L6ctfnzA">
-    <children xmi:type="notation:Node" xmi:id="_9G-fMFgvEeOZc_L6ctfnzA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9G-fMVgvEeOZc_L6ctfnzA" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_9G-fMlgvEeOZc_L6ctfnzA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_9G-fM1gvEeOZc_L6ctfnzA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_9G9REVgvEeOZc_L6ctfnzA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_9G9RElgvEeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="InvariantContainerConfiguration.ecore#//InvariantContainerConfiguration/permissions"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9G9RE1gvEeOZc_L6ctfnzA" points="[46, 11, -232, 0]$[245, 11, -33, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9HCJkFgvEeOZc_L6ctfnzA" id="(0.8575851393188855,0.4049586776859504)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9HCJkVgvEeOZc_L6ctfnzA" id="(0.11221122112211221,0.49586776859504134)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_dY9UgGESEeOnIp9uJgA5yw" type="3003" source="_cp6W8FgvEeOZc_L6ctfnzA" target="_aIUqMGESEeOnIp9uJgA5yw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_dY9UgWESEeOnIp9uJgA5yw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_dY9UgmESEeOnIp9uJgA5yw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dY9Ug2ESEeOnIp9uJgA5yw" points="[-7, -15, -4, 171]$[-7, -157, -4, 29]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dZh8QGESEeOnIp9uJgA5yw" id="(0.5108359133126935,0.1322314049586777)"/>
-  </edges>
-</notation:Diagram>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.genmodel b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.genmodel
deleted file mode 100644
index e370f0ec056..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantContainerConfiguration.genmodel
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.infra.extendedtypes/src-gen" editDirectory="/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen"
-    editorDirectory="/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.extendedtypes"
-    modelName="InvariantContainerConfiguration" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ExtendedTypes.genmodel#//extendedtypes InvariantSemanticTypeConfiguration.genmodel#//invariantsemantictypeconfiguration"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>InvariantContainerConfiguration.ecore</foreignModel>
-  <genPackages prefix="InvariantContainerConfiguration" basePackage="org.eclipse.papyrus.infra.extendedtypes"
-      resource="XML" disposableProviderFactory="true" ecorePackage="InvariantContainerConfiguration.ecore#/">
-    <genClasses ecoreClass="InvariantContainerConfiguration.ecore#//InvariantContainerConfiguration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference InvariantContainerConfiguration.ecore#//InvariantContainerConfiguration/permissions"/>
-    </genClasses>
-    <genClasses ecoreClass="InvariantContainerConfiguration.ecore#//HierarchyPermission">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantContainerConfiguration.ecore#//HierarchyPermission/childType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantContainerConfiguration.ecore#//HierarchyPermission/isPermitted"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantContainerConfiguration.ecore#//HierarchyPermission/isStrict"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecore b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecore
deleted file mode 100644
index 733a4536d89..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecore
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="invariantsemantictypeconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"
-    nsPrefix="invariantsemantictypeconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="InvariantSemanticTypeConfiguration"
-      eSuperTypes="ExtendedTypes.ecore#//SemanticTypeConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="invariantRuleConfiguration"
-        lowerBound="1" eType="#//InvariantRuleConfiguration" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InvariantRuleConfiguration" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ComposedRuleConfiguration" abstract="true"
-      eSuperTypes="#//InvariantRuleConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRules" lowerBound="2"
-        upperBound="-1" eType="#//InvariantRuleConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AndRule" eSuperTypes="#//ComposedRuleConfiguration"/>
-  <eClassifiers xsi:type="ecore:EClass" name="OrRule" eSuperTypes="#//ComposedRuleConfiguration"/>
-</ecore:EPackage>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecorediag b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecorediag
deleted file mode 100644
index 7da4b3c881c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecorediag
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram 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" xmi:id="_198uYFgsEeOZc_L6ctfnzA" type="EcoreTools" name="InvariantSemanticTypeConfiguration" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_U563UFgtEeOZc_L6ctfnzA" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VCu1EFgtEeOZc_L6ctfnzA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VCu1EVgtEeOZc_L6ctfnzA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_U59TkFgtEeOZc_L6ctfnzA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_U6A98FgtEeOZc_L6ctfnzA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_U6A98VgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_U6A98lgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_U6A981gtEeOZc_L6ctfnzA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_U6CMEFgtEeOZc_L6ctfnzA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_U6CMEVgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_U6CMElgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_U6CME1gtEeOZc_L6ctfnzA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_U563UVgtEeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//SemanticTypeConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U563UlgtEeOZc_L6ctfnzA" x="260" y="60" width="243" height="123"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_YznswFgtEeOZc_L6ctfnzA" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y0SbIFgtEeOZc_L6ctfnzA" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y0SbIVgtEeOZc_L6ctfnzA" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_Yzo64FgtEeOZc_L6ctfnzA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_Yzph8FgtEeOZc_L6ctfnzA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Yzph8VgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Yzph8lgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Yzph81gtEeOZc_L6ctfnzA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_YzqJAFgtEeOZc_L6ctfnzA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_YzqJAVgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_YzqJAlgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_YzqJA1gtEeOZc_L6ctfnzA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_YzoT0FgtEeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="ExtendedTypes.ecore#//SemanticTypeAdviceConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YzoT0VgtEeOZc_L6ctfnzA" x="740" y="60" width="243" height="123"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_m4QsMFgtEeOZc_L6ctfnzA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_m4RTQFgtEeOZc_L6ctfnzA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_m4RTQVgtEeOZc_L6ctfnzA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_m4RTQlgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_m4RTQ1gtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_m4RTRFgtEeOZc_L6ctfnzA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_m4ShYFgtEeOZc_L6ctfnzA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_m4ShYVgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_m4ShYlgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_m4ShY1gtEeOZc_L6ctfnzA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_m4QsMVgtEeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="InvariantSemanticTypeConfiguration.ecore#//InvariantSemanticTypeConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m4QsMlgtEeOZc_L6ctfnzA" x="260" y="300" width="241" height="283"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_9PhpIFgtEeOZc_L6ctfnzA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_9Pw5sFgtEeOZc_L6ctfnzA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_9PyH0FgtEeOZc_L6ctfnzA" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_9PyH0VgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_9PyH0lgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9PyH01gtEeOZc_L6ctfnzA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_9PzV8FgtEeOZc_L6ctfnzA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_9PzV8VgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_9PzV8lgtEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_9PzV81gtEeOZc_L6ctfnzA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_9PhpIVgtEeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="InvariantSemanticTypeConfiguration.ecore#//InvariantRuleConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9PhpIlgtEeOZc_L6ctfnzA" x="740" y="295" width="241" height="121"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_WRwtgGEAEeOnIp9uJgA5yw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_WR4CQGEAEeOnIp9uJgA5yw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_WR7FkGEAEeOnIp9uJgA5yw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_WR7FkWEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_WR7FkmEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WR7Fk2EAEeOnIp9uJgA5yw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_WR-v8GEAEeOnIp9uJgA5yw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_WR-v8WEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_WR-v8mEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WR-v82EAEeOnIp9uJgA5yw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_WRxUkGEAEeOnIp9uJgA5yw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="InvariantSemanticTypeConfiguration.ecore#//ComposedRuleConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WRxUkWEAEeOnIp9uJgA5yw" x="750" y="500" width="223" height="65"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_bwCUEGEAEeOnIp9uJgA5yw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_bwGlgGEAEeOnIp9uJgA5yw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_bwIasGEAEeOnIp9uJgA5yw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_bwIasWEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_bwIasmEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bwIas2EAEeOnIp9uJgA5yw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_bwKP4GEAEeOnIp9uJgA5yw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_bwKP4WEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_bwKP4mEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bwKP42EAEeOnIp9uJgA5yw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_bwCUEWEAEeOnIp9uJgA5yw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="InvariantSemanticTypeConfiguration.ecore#//AndRule"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bwCUEmEAEeOnIp9uJgA5yw" x="720" y="635"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_idxXYGEAEeOnIp9uJgA5yw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_id0asGEAEeOnIp9uJgA5yw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_id2P4GEAEeOnIp9uJgA5yw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_id2P4WEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_id2P4mEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_id2P42EAEeOnIp9uJgA5yw"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_id4sIGEAEeOnIp9uJgA5yw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_id4sIWEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_id4sImEAEeOnIp9uJgA5yw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_id4sI2EAEeOnIp9uJgA5yw"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_idxXYWEAEeOnIp9uJgA5yw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="InvariantSemanticTypeConfiguration.ecore#//OrRule"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_idxXYmEAEeOnIp9uJgA5yw" x="910" y="636"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_198uYVgsEeOZc_L6ctfnzA"/>
-  <element xmi:type="ecore:EPackage" href="InvariantSemanticTypeConfiguration.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_pnZL8FgtEeOZc_L6ctfnzA" type="3003" source="_m4QsMFgtEeOZc_L6ctfnzA" target="_U563UFgtEeOZc_L6ctfnzA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_pnZL8VgtEeOZc_L6ctfnzA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_pnZL8lgtEeOZc_L6ctfnzA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pnZL81gtEeOZc_L6ctfnzA" points="[4, -1, 1, 144]$[4, -120, 1, 25]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pnf5oFgtEeOZc_L6ctfnzA" id="(0.4854771784232365,0.01652892561983471)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pnggsFgtEeOZc_L6ctfnzA" id="(0.49382716049382713,0.7967479674796748)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_AyD7wFguEeOZc_L6ctfnzA" type="3002" source="_m4QsMFgtEeOZc_L6ctfnzA" target="_9PhpIFgtEeOZc_L6ctfnzA">
-    <children xmi:type="notation:Node" xmi:id="_AyEi0FguEeOZc_L6ctfnzA" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_AyEi0VguEeOZc_L6ctfnzA" x="-37" y="-12"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_AyFJ4FguEeOZc_L6ctfnzA" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_AyFJ4VguEeOZc_L6ctfnzA" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_AyD7wVguEeOZc_L6ctfnzA" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_AyD7wlguEeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="InvariantSemanticTypeConfiguration.ecore#//InvariantSemanticTypeConfiguration/invariantRuleConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AyD7w1guEeOZc_L6ctfnzA" points="[38, -156, -288, -17]$[279, -156, -47, -17]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AyKpcFguEeOZc_L6ctfnzA" id="(0.8423236514522822,0.734982332155477)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AyKpcVguEeOZc_L6ctfnzA" id="(0.1991701244813278,0.6115702479338843)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_knk8gGEAEeOnIp9uJgA5yw" type="3003" source="_WRwtgGEAEeOnIp9uJgA5yw" target="_9PhpIFgtEeOZc_L6ctfnzA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_knk8gWEAEeOnIp9uJgA5yw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_knk8gmEAEeOnIp9uJgA5yw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_knk8g2EAEeOnIp9uJgA5yw" points="[-9, -12, 116, 151]$[-85, -103, 40, 60]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_knuGcGEAEeOnIp9uJgA5yw" id="(0.5201793721973094,0.2)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_lKVEQGEAEeOnIp9uJgA5yw" type="3003" source="_bwCUEGEAEeOnIp9uJgA5yw" target="_WRwtgGEAEeOnIp9uJgA5yw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_lKVEQWEAEeOnIp9uJgA5yw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_lKVEQmEAEeOnIp9uJgA5yw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lKVrUGEAEeOnIp9uJgA5yw" points="[11, -20, -79, 104]$[11, -60, -79, 64]$[80, -60, -10, 64]$[80, -92, -10, 32]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_l2N54GEAEeOnIp9uJgA5yw" type="3003" source="_idxXYGEAEeOnIp9uJgA5yw" target="_WRwtgGEAEeOnIp9uJgA5yw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_l2N54WEAEeOnIp9uJgA5yw" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_l2N54mEAEeOnIp9uJgA5yw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l2N542EAEeOnIp9uJgA5yw" points="[-40, -20, 60, 105]$[-40, -61, 60, 64]$[-110, -61, -10, 64]$[-110, -93, -10, 32]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_m3-44GEAEeOnIp9uJgA5yw" type="3002" source="_WRwtgGEAEeOnIp9uJgA5yw" target="_9PhpIFgtEeOZc_L6ctfnzA">
-    <children xmi:type="notation:Node" xmi:id="_m4CjQGEAEeOnIp9uJgA5yw" type="4011">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_m4CjQWEAEeOnIp9uJgA5yw" x="-10" y="-10"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_m4E_gGEAEeOnIp9uJgA5yw" type="4012">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_m4E_gWEAEeOnIp9uJgA5yw" x="10" y="10"/>
-    </children>
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_m3-44WEAEeOnIp9uJgA5yw" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_m3-44mEAEeOnIp9uJgA5yw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
-    <element xmi:type="ecore:EReference" href="InvariantSemanticTypeConfiguration.ecore#//ComposedRuleConfiguration/composedRules"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_m3-442EAEeOnIp9uJgA5yw" points="[-32, 10, 2, 155]$[-193, 10, -159, 155]$[-193, -135, -159, 10]$[-42, -135, -8, 10]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m4NiYGEAEeOnIp9uJgA5yw" id="(0.14798206278026907,0.4)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m4NiYWEAEeOnIp9uJgA5yw" id="(0.03734439834024896,0.71900826446281)"/>
-  </edges>
-</notation:Diagram>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.genmodel b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.genmodel
deleted file mode 100644
index 293d863d31e..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.genmodel
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.infra.extendedtypes/src-gen" creationSubmenus="true"
-    editDirectory="/org.eclipse.papyrus.infra.extendedtypes.edit/src-gen" editorDirectory="/org.eclipse.papyrus.infra.extendedtypes.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.infra.extendedtypes" modelName="InvariantSemanticTypeConfiguration"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.extendedtypes.tests/src-gen"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ExtendedTypes.genmodel#//extendedtypes"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>InvariantSemanticTypeConfiguration.ecore</foreignModel>
-  <genPackages prefix="InvariantSemanticTypeConfiguration" basePackage="org.eclipse.papyrus.infra.extendedtypes"
-      resource="XML" disposableProviderFactory="true" childCreationExtenders="true"
-      ecorePackage="InvariantSemanticTypeConfiguration.ecore#/">
-    <genClasses ecoreClass="InvariantSemanticTypeConfiguration.ecore#//InvariantSemanticTypeConfiguration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference InvariantSemanticTypeConfiguration.ecore#//InvariantSemanticTypeConfiguration/invariantRuleConfiguration"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="InvariantSemanticTypeConfiguration.ecore#//InvariantRuleConfiguration"/>
-    <genClasses image="false" ecoreClass="InvariantSemanticTypeConfiguration.ecore#//ComposedRuleConfiguration">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference InvariantSemanticTypeConfiguration.ecore#//ComposedRuleConfiguration/composedRules"/>
-    </genClasses>
-    <genClasses ecoreClass="InvariantSemanticTypeConfiguration.ecore#//AndRule"/>
-    <genClasses ecoreClass="InvariantSemanticTypeConfiguration.ecore#//OrRule"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/plugin.properties b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/plugin.properties
deleted file mode 100644
index cd7f34a00f2..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 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:
-#     CEA LIST - initial API and implementation
-###############################################################################
-pluginName=Papyrus enhanced types metamodel plugin
-providerName=Eclipse Modeling Project
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/plugin.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/plugin.xml
deleted file mode 100644
index ab8ef8d6d4c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/plugin.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>r
-
- $Id$
--->
-
-<plugin>
-   <extension-point id="extendedElementTypeSet" name="ExtendedElementTypeSet Configuration Model" schema="schema/extendedElementTypeSet.exsd"/>
-   <extension-point id="extendedTypeConfiguration" name="extended type configuration" schema="schema/extendedTypeConfiguration.exsd"/>
-   <extension-point id="invariantRule" name="Invariant Rule Extension Point" schema="schema/invariantRule.exsd"/>
-   <extension-point id="elementMatcherConfiguration" name="Element Macher Configuration" schema="schema/elementMatcherConfiguration.exsd"/>
-   <extension-point id="aspectActionConfiguration" name="Aspect Action Configuration" schema="schema/aspectActionConfiguration.exsd"/>
-   <extension-point id="userExtendedTypes" name="User Extended Types Definitions" schema="schema/userExtendedTypes.exsd"/>
-   
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated InvariantSemanticTypeConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0"
-            class="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage"
-            genModel="model/InvariantSemanticTypeConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated InvariantSemanticTypeConfiguration -->
-      <parser
-            type="invariantsemantictypeconfiguration"
-            class="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util.InvariantSemanticTypeConfigurationResourceFactoryImpl"/>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated ExtendedTypes -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"
-            class="org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage"
-            genModel="model/ExtendedTypes.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated ExtendedTypes -->
-      <parser
-            type="extendedtypes"
-            class="org.eclipse.papyrus.infra.extendedtypes.util.ExtendedtypesResourceFactoryImpl"/>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated InvariantContainerConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0"
-            class="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage"
-            genModel="model/InvariantContainerConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated InvariantContainerConfiguration -->
-      <parser
-            type="invariantcontainerconfiguration"
-            class="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util.InvariantContainerConfigurationResourceFactoryImpl"/>
-   </extension>
-   
-   <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.extendedTypeConfiguration">
-      <configuration
-            configurationClass="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration"
-            description="Configuration for Semantic element Types that have invariants (always same father, always have a type, etc.)"
-            factoryClass="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantElementTypeFactory"
-            name="Invariant Semantic Type Configuration">
-      </configuration>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.invariantRule">
-      <invariantRule
-            configurationClass="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule"
-            editHelperAdvice="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRuleEditHelperAdvice">
-      </invariantRule>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.invariantRule">
-      <invariantRule
-            configurationClass="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule"
-            editHelperAdvice="org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRuleEditHelperAdvice">
-      </invariantRule>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.invariantRule">
-      <invariantRule
-            configurationClass="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration"
-            editHelperAdvice="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerEditHelperAdvice"
-            elementMatcher="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerMatcher"
-            semanticTypeDescriptor="org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationContainerDescriptor">
-      </invariantRule>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.core.service">
-      <service
-            classname="org.eclipse.papyrus.infra.extendedtypes.ExtendedTypeRegistryService"
-            description="Service used to registrer extended element types in the registry"
-            priority="50"
-            startKind="startup">
-      </service>
-   </extension>
-   
-    <extension
-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-      <metamodel
-            nsURI="http://www.eclipse.org/emf/2002/Ecore">
-         <adviceBinding
-               class="org.eclipse.papyrus.infra.extendedtypes.advices.ExtendedTypesOwnerAdvice"
-               id="org.eclipse.papyrus.infra.extendedtypes.advice.OwnerAdvice"
-               inheritance="all"
-               typeId="*">
-         </adviceBinding>
-      </metamodel>
-   </extension>
-   <extension
-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-      <binding
-            context="org.eclipse.papyrus.infra.services.edit.TypeContext">
-         <elementType
-               pattern="org\.eclipse\.papyrus\.uml\.([^d]|$|d([^i]|$)|di([^a]|$)|dia([^g]|$)|diag([^r]|$)|diagr([^a]|$)|diagra([^m]|$))">
-         </elementType>
-         <advice
-               ref="org.eclipse.papyrus.infra.extendedtypes.advice.OwnerAdvice">
-         </advice>
-      </binding>
-   </extension>
-   
-   <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.extendedTypeConfiguration">
-      <configuration
-            configurationClass="org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration"
-            description="configuration for semantic element types that have aspect actions for creation"
-            factoryClass="org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeFactory"
-            name="Aspect Semantic Type Configuration">
-      </configuration>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.extendedTypeConfiguration">
-      <configuration
-            configurationClass="org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration"
-            description="configuration for view-only element types that have potential aspect actions for creation"
-            factoryClass="org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeFactory"
-            name="Aspect View Type Configuration">
-      </configuration>
-   </extension>
-  
-</plugin>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/pom.xml b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/pom.xml
deleted file mode 100644
index 8188b14cb85..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.infra-xtypes</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.extendedtypes</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd
deleted file mode 100644
index 45bfd237340..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/aspectActionConfiguration.exsd
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.papyrus.infra.extendedtypes" id="aspectActionConfiguration" name="Aspect Action Configuration"/>
-      </appInfo>
-      <documentation>
-         Extension point to describe new kind of Pre/Post actions in the extended element types framework.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="aspectAction"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="aspectAction">
-      <complexType>
-         <attribute name="configurationClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="semanticTypeDescriptor" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionContainerDescriptor"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="editHelperAdvice" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionEditHelperAdvice"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="configurationModelCreation" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="creationElementValidator" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         0.10.1
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         See examples in the emf or uml extended types
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiinfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2014 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:
-CEA LIST - initial API and implementation
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/elementMatcherConfiguration.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/elementMatcherConfiguration.exsd
deleted file mode 100644
index 6a3b87e33ad..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/elementMatcherConfiguration.exsd
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.papyrus.infra.extendedtypes" id="extendedTypeMatcherConfiguration" name="Extended Type Macher Configuration"/>
-      </appInfo>
-      <documentation>
-         Extension point to define new kind of model-based configurable IElementMatcher and their factories
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="configuration"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="configuration">
-      <complexType>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="configurationClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  class name of the configuration model implementation
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="factoryClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  class name of the factory used to create new element matchers based on the given configuration
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IConfigurableElementMatcherFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="configurationModelCreation" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IElementMatcherConfigurationModelCreation"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         0.10.1
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiinfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/extendedElementTypeSet.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/extendedElementTypeSet.exsd
deleted file mode 100644
index 4489e6359c7..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/extendedElementTypeSet.exsd
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.papyrus.infra.extendedtypes" id="extendedTypesSet" name="extendedTypesSet"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to registered element type sets configuration models
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="extendedTypesSet"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="extendedTypesSet">
-      <annotation>
-         <documentation>
-            define a new configuration for an extended element type set
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  Name of this model file, used in user interface
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  Path to an icon, used in user interface
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  Description of the configuration
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Path to the model file in the bundle. 
-
-Note: Do not forget to add the file in the binary build of the plugin!
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The unique identifier of this contribution. To ease debug, it is advised to put the same identifier as the extended type set configuration identifier.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         0.10.2
-      </documentation>
-   </annotation>
-
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2010-2013 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:
-CEA LIST - initial API and implementation
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/extendedTypeConfiguration.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/extendedTypeConfiguration.exsd
deleted file mode 100644
index bd02f7fe3a8..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/extendedTypeConfiguration.exsd
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.papyrus.infra.extendedtypes" id="extendedTypeConfiguration" name="extendedTypeConfiguration"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to registered new kind of extended element types set configuration for creation of semantic/graphical elements
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="configuration"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="configuration">
-      <annotation>
-         <documentation>
-            define a new configuration for an extended element type set
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  Name of this model file, used in user interface
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  Path to an icon, used in user interface
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  Description of the configuration
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="factoryClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  factory class that creates new ElementTypes based on the configuration model
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.IExtendedElementTypeFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="configurationClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Configuration class of the element type.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="itemProvider" type="string">
-            <annotation>
-               <documentation>
-                  optional item provider used to add creation menus in the standard emf editor
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         0.10.2
-      </documentation>
-   </annotation>
-
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2010-2013 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:
-CEA LIST - initial API and implementation
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/invariantRule.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/invariantRule.exsd
deleted file mode 100644
index 86e2f06cd0f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/invariantRule.exsd
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.papyrus.infra.extendedtypes" id="invariantRule" name="Invariant Rule Extension Point"/>
-      </appInfo>
-      <documentation>
-         Extension point to describe new invariant rules. These rules will be used by configurable element types at runtime
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="invariantRule"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="invariantRule">
-      <complexType>
-         <attribute name="configurationClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="elementMatcher" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantElementMatcher"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="semanticTypeDescriptor" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantContainerDescriptor"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="editHelperAdvice" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantEditHelperAdvice"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="configurationModelCreation" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantConfigurationModelCreation"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiinfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/semanticTypeFactory.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/semanticTypeFactory.exsd
deleted file mode 100644
index 1c9fc0286c6..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/semanticTypeFactory.exsd
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.extendedtypes" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.papyrus.infra.extendedtypes" id="semanticTypeFactory" name="Semantic Type Factory"/>
-      </appInfo>
-      <documentation>
-         Extension point to describe new semantic type factories that will be configured by some EMF models. These factories will be usd to create new semantic ElementTypes (see GMF framework for more information about ElementTypes)
-
-
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="semanticTypeFactory"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="semanticTypeFactory">
-      <annotation>
-         <documentation>
-            Extension for new factories for semantic  element types
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Name of this factory (used in UIs)
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="factoryClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Implementation class of this factory.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.semantic.ISemanticTypeFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="factoryMetamodel" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Ecore file of the metamodel used to configure this factory
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="rootEObject" type="string">
-            <annotation>
-               <documentation>
-                  EClass of the main configuration element. This is used to identify the factory amongst others during element type creation. 
-
-This EClass is expected to be defined in the factory metamodel.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.emf.ecore.EObject"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0.0 - Initial API and Contribution by CEA LIST
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiinfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2013 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:
-CEA LIST - initial API and implementation
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/userExtendedTypes.exsd b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/userExtendedTypes.exsd
deleted file mode 100644
index 2ef22bd14e0..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/schema/userExtendedTypes.exsd
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.elementtypesconfigurations" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.papyrus.infra.elementtypesconfigurations" id="userExtendedTypes" name="User Extended Type Definitions"/>
-      </appInfo>
-      <documentation>
-         &lt;p&gt;
-This extension point is used to register providers of user-defined extended types.
-&lt;/p&gt;&lt;p&gt;
-&lt;b&gt;Note&lt;/b&gt; that this extension point is intended for internal use within the Papyrus
-extended-types framework only.
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="provider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="provider">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.extendedtypes.internal.spi.IUserExtendedTypesProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.&lt;br/&gt;
-&lt;br/&gt;
-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&lt;br/&gt;
-&lt;br/&gt;
-Contributors:&lt;br/&gt;
-&amp;nbsp;&amp;nbsp;CEA LIST - initial API and implementation&lt;br/&gt;
-&amp;nbsp;&amp;nbsp;Christian W. Damus - bug 485220&lt;br/&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ActionConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ActionConfiguration.java
deleted file mode 100644
index 306580d0d2d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ActionConfiguration.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Action Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getActionConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface ActionConfiguration extends ConfigurationElement {
-} // ActionConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeConfiguration.java
deleted file mode 100644
index 94f330b8d74..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeConfiguration.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Aspect Semantic Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectSemanticTypeConfiguration()
- * @model
- * @generated
- */
-public interface AspectSemanticTypeConfiguration extends SemanticTypeConfiguration {
-
-	/**
-	 * Returns the value of the '<em><b>Action Configuration</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Action Configuration</em>' containment reference list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Action Configuration</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectSemanticTypeConfiguration_ActionConfiguration()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<SemanticActionConfiguration> getActionConfiguration();
-} // AspectSemanticTypeConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeConfiguration.java
deleted file mode 100644
index 3b8f0e858ba..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeConfiguration.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Aspect View Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectViewTypeConfiguration()
- * @model
- * @generated
- */
-public interface AspectViewTypeConfiguration extends ViewTypeConfiguration {
-
-	/**
-	 * Returns the value of the '<em><b>Action Configuration</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Action Configuration</em>' containment reference list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Action Configuration</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getAspectViewTypeConfiguration_ActionConfiguration()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<ViewActionConfiguration> getActionConfiguration();
-} // AspectViewTypeConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeFactory.java
deleted file mode 100644
index 842f0e68c6c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/AspectViewTypeFactory.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-
-
-/**
- * @author RS211865
- */
-public class AspectViewTypeFactory extends AbstractConfigurableElementTypeFactory<AspectViewTypeConfiguration> {
-
-	/**
-	 * Default Constructor
-	 */
-	public AspectViewTypeFactory() {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IEditHelperAdvice createEditHelperAdvice(AspectViewTypeConfiguration configuration) {
-		// List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
-		// List<IEditHelperAdvice> actionAdvices = new ArrayList<IEditHelperAdvice>(semanticActionConfigurations.size());
-		// for(SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
-		// IEditHelperAdvice advice = AspectConfigurationFactoryRegistry.getInstance().createEditHelperAdvice(actionConfiguration);
-		// if(advice!=null) {
-		// actionAdvices.add(advice);
-		// // } else {
-		// // Activator.log.error("Impossible to create an advice for :" + actionConfiguration, null);
-		// }
-		// }
-		// if(actionAdvices!=null && actionAdvices.size() > 0) {
-		// return new ComposedEditHelperAdvice(actionAdvices);
-		// }
-		return new AbstractEditHelperAdvice() {
-
-		};
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IContainerDescriptor createContainerDescriptor(AspectViewTypeConfiguration configuration) {
-		// List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
-		// List<IContainerDescriptor> containerDescriptors = new ArrayList<IContainerDescriptor>(semanticActionConfigurations.size());
-		// for(SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
-		// IContainerDescriptor containerDescriptor = AspectConfigurationFactoryRegistry.getInstance().createContainerDescriptor(actionConfiguration);
-		// if(containerDescriptor!=null) {
-		// containerDescriptors.add(containerDescriptor);
-		// // } else {
-		// // Activator.log.error("Impossible to create a container descriptor for :" + actionConfiguration, null);
-		// }
-		// }
-		// if(containerDescriptors!=null && containerDescriptors.size() > 0) {
-		// return new ComposedContainerDescriptor(containerDescriptors);
-		// }
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICreationElementValidator createElementCreationValidator(AspectViewTypeConfiguration configuration) {
-		// List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
-		// List<ICreationElementValidator> actionValidators = new ArrayList<ICreationElementValidator>(semanticActionConfigurations.size());
-		// for(SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
-		// ICreationElementValidator validator = AspectConfigurationFactoryRegistry.getInstance().createCreationElementValidator(actionConfiguration);
-		// if(validator!=null) {
-		// actionValidators.add(validator);
-		// // } else {
-		// // Activator.log.error("Impossible to create a creation element validator for :" + actionConfiguration, null);
-		// }
-		// }
-		// if(actionValidators!=null && actionValidators.size() > 0) {
-		// return new ComposedElementCreationValidator(actionValidators);
-		// }
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IElementMatcher createElementMatcher(AspectViewTypeConfiguration configuration) {
-		// these element types are there only for creation => it can not be match at any time
-		return new NullElementMatcher();
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ConfigurationElement.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ConfigurationElement.java
deleted file mode 100644
index 5c3ed24bdf5..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ConfigurationElement.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Configuration Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription <em>Description</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier <em>Identifier</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry <em>Icon Entry</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement()
- * @model abstract="true"
- * @generated
- */
-public interface ConfigurationElement extends EObject {
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_Name()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Identifier</em>' attribute.
-	 * @see #setIdentifier(String)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_Identifier()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getIdentifier();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Identifier</em>' attribute.
-	 * @see #getIdentifier()
-	 * @generated
-	 */
-	void setIdentifier(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icon Entry</em>' containment reference isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Icon Entry</em>' containment reference.
-	 * @see #setIconEntry(IconEntry)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getConfigurationElement_IconEntry()
-	 * @model containment="true"
-	 * @generated
-	 */
-	IconEntry getIconEntry();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry <em>Icon Entry</em>}' containment
-	 * reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Icon Entry</em>' containment reference.
-	 * @see #getIconEntry()
-	 * @generated
-	 */
-	void setIconEntry(IconEntry value);
-} // ConfigurationElement
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeAdviceConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeAdviceConfiguration.java
deleted file mode 100644
index c9d2ce7a231..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeAdviceConfiguration.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element Type Advice Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeAdviceConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface ElementTypeAdviceConfiguration extends ConfigurationElement {
-} // ElementTypeAdviceConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeConfiguration.java
deleted file mode 100644
index 787f583fe3f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ElementTypeConfiguration.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint <em>Hint</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName <em>Kind Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface ElementTypeConfiguration extends ConfigurationElement {
-
-	/**
-	 * Returns the value of the '<em><b>Hint</b></em>' attribute.
-	 * The default value is <code>"ExtendedElements"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hint</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Hint</em>' attribute.
-	 * @see #setHint(String)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_Hint()
-	 * @model default="ExtendedElements"
-	 * @generated
-	 */
-	String getHint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint <em>Hint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Hint</em>' attribute.
-	 * @see #getHint()
-	 * @generated
-	 */
-	void setHint(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Kind Name</b></em>' attribute.
-	 * The default value is <code>"org.eclipse.gmf.runtime.emf.type.core.IHintedType"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Kind Name</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Kind Name</em>' attribute.
-	 * @see #setKindName(String)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_KindName()
-	 * @model default="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-	 * @generated
-	 */
-	String getKindName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName <em>Kind Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Kind Name</em>' attribute.
-	 * @see #getKindName()
-	 * @generated
-	 */
-	void setKindName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Specialized Types ID</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Specialized Types ID</em>' attribute list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Specialized Types ID</em>' attribute list.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_SpecializedTypesID()
-	 * @model required="true"
-	 * @generated
-	 */
-	EList<String> getSpecializedTypesID();
-
-	/**
-	 * Returns the value of the '<em><b>Matcher Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Matcher Configuration</em>' containment reference isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Matcher Configuration</em>' containment reference.
-	 * @see #setMatcherConfiguration(MatcherConfiguration)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getElementTypeConfiguration_MatcherConfiguration()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MatcherConfiguration getMatcherConfiguration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration
-	 * <em>Matcher Configuration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Matcher Configuration</em>' containment reference.
-	 * @see #getMatcherConfiguration()
-	 * @generated
-	 */
-	void setMatcherConfiguration(MatcherConfiguration value);
-} // ElementTypeConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSet.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSet.java
deleted file mode 100644
index 5b78cc65a24..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSet.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extended Element Type Set</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType <em>Element Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible <em>Extensible</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet()
- * @model
- * @generated
- */
-public interface ExtendedElementTypeSet extends ConfigurationElement {
-
-	/**
-	 * Returns the value of the '<em><b>Element Type</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element Type</em>' containment reference list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Element Type</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet_ElementType()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	EList<ElementTypeConfiguration> getElementType();
-
-	/**
-	 * Returns the value of the '<em><b>Extensible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Extensible</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Extensible</em>' attribute.
-	 * @see #setExtensible(boolean)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getExtendedElementTypeSet_Extensible()
-	 * @model
-	 * @generated
-	 */
-	boolean isExtensible();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible <em>Extensible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Extensible</em>' attribute.
-	 * @see #isExtensible()
-	 * @generated
-	 */
-	void setExtensible(boolean value);
-} // ExtendedElementTypeSet
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesFactory.java
deleted file mode 100644
index ceb1dd69bc5..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesFactory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage
- * @generated
- */
-public interface ExtendedtypesFactory extends EFactory {
-
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	ExtendedtypesFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Extended Element Type Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Extended Element Type Set</em>'.
-	 * @generated
-	 */
-	ExtendedElementTypeSet createExtendedElementTypeSet();
-
-	/**
-	 * Returns a new object of class '<em>Icon Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Icon Entry</em>'.
-	 * @generated
-	 */
-	IconEntry createIconEntry();
-
-	/**
-	 * Returns a new object of class '<em>Aspect Semantic Type Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Aspect Semantic Type Configuration</em>'.
-	 * @generated
-	 */
-	AspectSemanticTypeConfiguration createAspectSemanticTypeConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>Aspect View Type Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Aspect View Type Configuration</em>'.
-	 * @generated
-	 */
-	AspectViewTypeConfiguration createAspectViewTypeConfiguration();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ExtendedtypesPackage getExtendedtypesPackage();
-} // ExtendedtypesFactory
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesPackage.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesPackage.java
deleted file mode 100644
index 917438089c9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ExtendedtypesPackage.java
+++ /dev/null
@@ -1,1421 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory
- * @model kind="package"
- * @generated
- */
-public interface ExtendedtypesPackage extends EPackage {
-
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNAME = "extendedtypes"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/1.0"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_PREFIX = "extendedtypes"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	ExtendedtypesPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl <em>Configuration Element</em>}'
-	 * class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getConfigurationElement()
-	 * @generated
-	 */
-	int CONFIGURATION_ELEMENT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int CONFIGURATION_ELEMENT__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int CONFIGURATION_ELEMENT__DESCRIPTION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int CONFIGURATION_ELEMENT__IDENTIFIER = 2;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int CONFIGURATION_ELEMENT__ICON_ENTRY = 3;
-
-	/**
-	 * The number of structural features of the '<em>Configuration Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int CONFIGURATION_ELEMENT_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl <em>Extended Element Type Set</em>}'
-	 * class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getExtendedElementTypeSet()
-	 * @generated
-	 */
-	int EXTENDED_ELEMENT_TYPE_SET = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ELEMENT_TYPE_SET__NAME = CONFIGURATION_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ELEMENT_TYPE_SET__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ELEMENT_TYPE_SET__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ELEMENT_TYPE_SET__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Element Type</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Extensible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE = CONFIGURATION_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Extended Element Type Set</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_ELEMENT_TYPE_SET_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl
-	 * <em>Element Type Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getElementTypeConfiguration()
-	 * @generated
-	 */
-	int ELEMENT_TYPE_CONFIGURATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_CONFIGURATION__NAME = CONFIGURATION_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_CONFIGURATION__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Hint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_CONFIGURATION__HINT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_CONFIGURATION__KIND_NAME = CONFIGURATION_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = CONFIGURATION_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = CONFIGURATION_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Element Type Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl <em>Icon Entry</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getIconEntry()
-	 * @generated
-	 */
-	int ICON_ENTRY = 2;
-
-	/**
-	 * The feature id for the '<em><b>Icon Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ICON_ENTRY__ICON_PATH = 0;
-
-	/**
-	 * The feature id for the '<em><b>Bundle Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ICON_ENTRY__BUNDLE_ID = 1;
-
-	/**
-	 * The number of structural features of the '<em>Icon Entry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ICON_ENTRY_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.MatcherConfigurationImpl <em>Matcher Configuration</em>}'
-	 * class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.MatcherConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getMatcherConfiguration()
-	 * @generated
-	 */
-	int MATCHER_CONFIGURATION = 4;
-
-	/**
-	 * The number of structural features of the '<em>Matcher Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int MATCHER_CONFIGURATION_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl <em>Action Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ActionConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getActionConfiguration()
-	 * @generated
-	 */
-	int ACTION_CONFIGURATION = 5;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ACTION_CONFIGURATION__NAME = CONFIGURATION_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ACTION_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ACTION_CONFIGURATION__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ACTION_CONFIGURATION__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;
-
-	/**
-	 * The number of structural features of the '<em>Action Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ACTION_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ViewActionConfigurationImpl <em>View Action Configuration</em>} ' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ViewActionConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getViewActionConfiguration()
-	 * @generated
-	 */
-	int VIEW_ACTION_CONFIGURATION = 6;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_ACTION_CONFIGURATION__NAME = ACTION_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_ACTION_CONFIGURATION__DESCRIPTION = ACTION_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_ACTION_CONFIGURATION__IDENTIFIER = ACTION_CONFIGURATION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_ACTION_CONFIGURATION__ICON_ENTRY = ACTION_CONFIGURATION__ICON_ENTRY;
-
-	/**
-	 * The number of structural features of the '<em>View Action Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_ACTION_CONFIGURATION_FEATURE_COUNT = ACTION_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl
-	 * <em>Semantic Action Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getSemanticActionConfiguration()
-	 * @generated
-	 */
-	int SEMANTIC_ACTION_CONFIGURATION = 7;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_ACTION_CONFIGURATION__NAME = ACTION_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_ACTION_CONFIGURATION__DESCRIPTION = ACTION_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_ACTION_CONFIGURATION__IDENTIFIER = ACTION_CONFIGURATION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_ACTION_CONFIGURATION__ICON_ENTRY = ACTION_CONFIGURATION__ICON_ENTRY;
-
-	/**
-	 * The number of structural features of the '<em>Semantic Action Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT = ACTION_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.SemanticTypeConfigurationImpl
-	 * <em>Semantic Type Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.SemanticTypeConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getSemanticTypeConfiguration()
-	 * @generated
-	 */
-	int SEMANTIC_TYPE_CONFIGURATION = 8;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_TYPE_CONFIGURATION__NAME = ELEMENT_TYPE_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION = ELEMENT_TYPE_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER = ELEMENT_TYPE_CONFIGURATION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY = ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Hint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_TYPE_CONFIGURATION__HINT = ELEMENT_TYPE_CONFIGURATION__HINT;
-
-	/**
-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_TYPE_CONFIGURATION__KIND_NAME = ELEMENT_TYPE_CONFIGURATION__KIND_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
-
-	/**
-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
-
-	/**
-	 * The number of structural features of the '<em>Semantic Type Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ViewTypeConfigurationImpl <em>View Type Configuration</em>}'
-	 * class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ViewTypeConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getViewTypeConfiguration()
-	 * @generated
-	 */
-	int VIEW_TYPE_CONFIGURATION = 9;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TYPE_CONFIGURATION__NAME = ELEMENT_TYPE_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TYPE_CONFIGURATION__DESCRIPTION = ELEMENT_TYPE_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TYPE_CONFIGURATION__IDENTIFIER = ELEMENT_TYPE_CONFIGURATION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TYPE_CONFIGURATION__ICON_ENTRY = ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Hint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TYPE_CONFIGURATION__HINT = ELEMENT_TYPE_CONFIGURATION__HINT;
-
-	/**
-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TYPE_CONFIGURATION__KIND_NAME = ELEMENT_TYPE_CONFIGURATION__KIND_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
-
-	/**
-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Specialized Diagram Type ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>View Type Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TYPE_CONFIGURATION_FEATURE_COUNT = ELEMENT_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeAdviceConfigurationImpl
-	 * <em>Element Type Advice Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeAdviceConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getElementTypeAdviceConfiguration()
-	 * @generated
-	 */
-	int ELEMENT_TYPE_ADVICE_CONFIGURATION = 10;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_ADVICE_CONFIGURATION__NAME = CONFIGURATION_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_ADVICE_CONFIGURATION__DESCRIPTION = CONFIGURATION_ELEMENT__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_ADVICE_CONFIGURATION__IDENTIFIER = CONFIGURATION_ELEMENT__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_ADVICE_CONFIGURATION__ICON_ENTRY = CONFIGURATION_ELEMENT__ICON_ENTRY;
-
-	/**
-	 * The number of structural features of the '<em>Element Type Advice Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_TYPE_ADVICE_CONFIGURATION_FEATURE_COUNT = CONFIGURATION_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectSemanticTypeConfigurationImpl
-	 * <em>Aspect Semantic Type Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.AspectSemanticTypeConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getAspectSemanticTypeConfiguration()
-	 * @generated
-	 */
-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION = 11;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__NAME = SEMANTIC_TYPE_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION = SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER = SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY = SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Hint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__HINT = SEMANTIC_TYPE_CONFIGURATION__HINT;
-
-	/**
-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__KIND_NAME = SEMANTIC_TYPE_CONFIGURATION__KIND_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
-
-	/**
-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Action Configuration</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION = SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Aspect Semantic Type Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT = SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectViewTypeConfigurationImpl
-	 * <em>Aspect View Type Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.AspectViewTypeConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedtypesPackageImpl#getAspectViewTypeConfiguration()
-	 * @generated
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION = 12;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION__NAME = VIEW_TYPE_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION__DESCRIPTION = VIEW_TYPE_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION__IDENTIFIER = VIEW_TYPE_CONFIGURATION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION__ICON_ENTRY = VIEW_TYPE_CONFIGURATION__ICON_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Hint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION__HINT = VIEW_TYPE_CONFIGURATION__HINT;
-
-	/**
-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION__KIND_NAME = VIEW_TYPE_CONFIGURATION__KIND_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = VIEW_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
-
-	/**
-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = VIEW_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Specialized Diagram Type ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID = VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID;
-
-	/**
-	 * The feature id for the '<em><b>Action Configuration</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION = VIEW_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Aspect View Type Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int ASPECT_VIEW_TYPE_CONFIGURATION_FEATURE_COUNT = VIEW_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet <em>Extended Element Type Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Extended Element Type Set</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet
-	 * @generated
-	 */
-	EClass getExtendedElementTypeSet();
-
-	/**
-	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType <em>Element Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Element Type</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#getElementType()
-	 * @see #getExtendedElementTypeSet()
-	 * @generated
-	 */
-	EReference getExtendedElementTypeSet_ElementType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible
-	 * <em>Extensible</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Extensible</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet#isExtensible()
-	 * @see #getExtendedElementTypeSet()
-	 * @generated
-	 */
-	EAttribute getExtendedElementTypeSet_Extensible();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration <em>Element Type Configuration</em>} '.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Element Type Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration
-	 * @generated
-	 */
-	EClass getElementTypeConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint <em>Hint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Hint</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getHint()
-	 * @see #getElementTypeConfiguration()
-	 * @generated
-	 */
-	EAttribute getElementTypeConfiguration_Hint();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName
-	 * <em>Kind Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Kind Name</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getKindName()
-	 * @see #getElementTypeConfiguration()
-	 * @generated
-	 */
-	EAttribute getElementTypeConfiguration_KindName();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getSpecializedTypesID
-	 * <em>Specialized Types ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute list '<em>Specialized Types ID</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getSpecializedTypesID()
-	 * @see #getElementTypeConfiguration()
-	 * @generated
-	 */
-	EAttribute getElementTypeConfiguration_SpecializedTypesID();
-
-	/**
-	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference '<em>Matcher Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration#getMatcherConfiguration()
-	 * @see #getElementTypeConfiguration()
-	 * @generated
-	 */
-	EReference getElementTypeConfiguration_MatcherConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry <em>Icon Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Icon Entry</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry
-	 * @generated
-	 */
-	EClass getIconEntry();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Icon Path</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath()
-	 * @see #getIconEntry()
-	 * @generated
-	 */
-	EAttribute getIconEntry_IconPath();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Bundle Id</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId()
-	 * @see #getIconEntry()
-	 * @generated
-	 */
-	EAttribute getIconEntry_BundleId();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Configuration Element</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement
-	 * @generated
-	 */
-	EClass getConfigurationElement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getName()
-	 * @see #getConfigurationElement()
-	 * @generated
-	 */
-	EAttribute getConfigurationElement_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription
-	 * <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getDescription()
-	 * @see #getConfigurationElement()
-	 * @generated
-	 */
-	EAttribute getConfigurationElement_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier
-	 * <em>Identifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Identifier</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIdentifier()
-	 * @see #getConfigurationElement()
-	 * @generated
-	 */
-	EAttribute getConfigurationElement_Identifier();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry
-	 * <em>Icon Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference '<em>Icon Entry</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement#getIconEntry()
-	 * @see #getConfigurationElement()
-	 * @generated
-	 */
-	EReference getConfigurationElement_IconEntry();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration <em>Matcher Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Matcher Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration
-	 * @generated
-	 */
-	EClass getMatcherConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Action Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration
-	 * @generated
-	 */
-	EClass getActionConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration <em>View Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>View Action Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration
-	 * @generated
-	 */
-	EClass getViewActionConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration
-	 * <em>Semantic Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Semantic Action Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration
-	 * @generated
-	 */
-	EClass getSemanticActionConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration
-	 * <em>Semantic Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Semantic Type Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration
-	 * @generated
-	 */
-	EClass getSemanticTypeConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration <em>View Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>View Type Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration
-	 * @generated
-	 */
-	EClass getViewTypeConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID
-	 * <em>Specialized Diagram Type ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Specialized Diagram Type ID</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID()
-	 * @see #getViewTypeConfiguration()
-	 * @generated
-	 */
-	EAttribute getViewTypeConfiguration_SpecializedDiagramTypeID();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration
-	 * <em>Element Type Advice Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Element Type Advice Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration
-	 * @generated
-	 */
-	EClass getElementTypeAdviceConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration
-	 * <em>Aspect Semantic Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Aspect Semantic Type Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration
-	 * @generated
-	 */
-	EClass getAspectSemanticTypeConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Action Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration#getActionConfiguration()
-	 * @see #getAspectSemanticTypeConfiguration()
-	 * @generated
-	 */
-	EReference getAspectSemanticTypeConfiguration_ActionConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration
-	 * <em>Aspect View Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Aspect View Type Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration
-	 * @generated
-	 */
-	EClass getAspectViewTypeConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration#getActionConfiguration <em>Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Action Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration#getActionConfiguration()
-	 * @see #getAspectViewTypeConfiguration()
-	 * @generated
-	 */
-	EReference getAspectViewTypeConfiguration_ActionConfiguration();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ExtendedtypesFactory getExtendedtypesFactory();
-} // ExtendedtypesPackage
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/IconEntry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/IconEntry.java
deleted file mode 100644
index f754368b808..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/IconEntry.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Icon Entry</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry()
- * @model
- * @generated
- */
-public interface IconEntry extends EObject {
-
-	/**
-	 * Returns the value of the '<em><b>Icon Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icon Path</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Icon Path</em>' attribute.
-	 * @see #setIconPath(String)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry_IconPath()
-	 * @model
-	 * @generated
-	 */
-	String getIconPath();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getIconPath <em>Icon Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Icon Path</em>' attribute.
-	 * @see #getIconPath()
-	 * @generated
-	 */
-	void setIconPath(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Bundle Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Bundle Id</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Bundle Id</em>' attribute.
-	 * @see #setBundleId(String)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getIconEntry_BundleId()
-	 * @model
-	 * @generated
-	 */
-	String getBundleId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry#getBundleId <em>Bundle Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Bundle Id</em>' attribute.
-	 * @see #getBundleId()
-	 * @generated
-	 */
-	void setBundleId(String value);
-} // IconEntry
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/MatcherConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/MatcherConfiguration.java
deleted file mode 100644
index c345cfaad59..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/MatcherConfiguration.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Matcher Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getMatcherConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface MatcherConfiguration extends EObject {
-} // MatcherConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticActionConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticActionConfiguration.java
deleted file mode 100644
index ae50c3deebe..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticActionConfiguration.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Semantic Action Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getSemanticActionConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface SemanticActionConfiguration extends ActionConfiguration {
-} // SemanticActionConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticTypeConfiguration.java
deleted file mode 100644
index aaf989eb278..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/SemanticTypeConfiguration.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Semantic Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Configuration specific to element types registered to manipulate Domain Specific elements.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getSemanticTypeConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface SemanticTypeConfiguration extends ElementTypeConfiguration {
-} // SemanticTypeConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewActionConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewActionConfiguration.java
deleted file mode 100644
index 36516999ef1..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewActionConfiguration.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>View Action Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getViewActionConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface ViewActionConfiguration extends ActionConfiguration {
-} // ViewActionConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewTypeConfiguration.java
deleted file mode 100644
index 4106cdbc99a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/ViewTypeConfiguration.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>View Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Configuration specific to element types registered to manipulate graphical elements in GMF diagrams
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID <em>Specialized Diagram Type ID</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getViewTypeConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface ViewTypeConfiguration extends ElementTypeConfiguration {
-
-	/**
-	 * Returns the value of the '<em><b>Specialized Diagram Type ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Specialized Diagram Type ID</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Specialized Diagram Type ID</em>' attribute.
-	 * @see #setSpecializedDiagramTypeID(String)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#getViewTypeConfiguration_SpecializedDiagramTypeID()
-	 * @model
-	 * @generated
-	 */
-	String getSpecializedDiagramTypeID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration#getSpecializedDiagramTypeID
-	 * <em>Specialized Diagram Type ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Specialized Diagram Type ID</em>' attribute.
-	 * @see #getSpecializedDiagramTypeID()
-	 * @generated
-	 */
-	void setSpecializedDiagramTypeID(String value);
-} // ViewTypeConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ActionConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ActionConfigurationImpl.java
deleted file mode 100644
index 776108ba90d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ActionConfigurationImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Action Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ActionConfigurationImpl extends ConfigurationElementImpl implements ActionConfiguration {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ActionConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getActionConfiguration();
-	}
-} // ActionConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectSemanticTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectSemanticTypeConfigurationImpl.java
deleted file mode 100644
index e04b0d686ee..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectSemanticTypeConfigurationImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Aspect Semantic Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectSemanticTypeConfigurationImpl#getActionConfiguration <em>Action Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AspectSemanticTypeConfigurationImpl extends SemanticTypeConfigurationImpl implements AspectSemanticTypeConfiguration {
-
-	/**
-	 * The cached value of the '{@link #getActionConfiguration() <em>Action Configuration</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getActionConfiguration()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SemanticActionConfiguration> actionConfiguration;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected AspectSemanticTypeConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getAspectSemanticTypeConfiguration();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EList<SemanticActionConfiguration> getActionConfiguration() {
-		if (actionConfiguration == null) {
-			actionConfiguration = new EObjectContainmentEList<SemanticActionConfiguration>(SemanticActionConfiguration.class, this, ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION);
-		}
-		return actionConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			return ((InternalEList<?>) getActionConfiguration()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			return getActionConfiguration();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			getActionConfiguration().clear();
-			getActionConfiguration().addAll((Collection<? extends SemanticActionConfiguration>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			getActionConfiguration().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			return actionConfiguration != null && !actionConfiguration.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-} // AspectSemanticTypeConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectViewTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectViewTypeConfigurationImpl.java
deleted file mode 100644
index dceb451af27..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/AspectViewTypeConfigurationImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Aspect View Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.AspectViewTypeConfigurationImpl#getActionConfiguration <em>Action Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AspectViewTypeConfigurationImpl extends ViewTypeConfigurationImpl implements AspectViewTypeConfiguration {
-
-	/**
-	 * The cached value of the '{@link #getActionConfiguration() <em>Action Configuration</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getActionConfiguration()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ViewActionConfiguration> actionConfiguration;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected AspectViewTypeConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getAspectViewTypeConfiguration();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EList<ViewActionConfiguration> getActionConfiguration() {
-		if (actionConfiguration == null) {
-			actionConfiguration = new EObjectContainmentEList<ViewActionConfiguration>(ViewActionConfiguration.class, this, ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION);
-		}
-		return actionConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			return ((InternalEList<?>) getActionConfiguration()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			return getActionConfiguration();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			getActionConfiguration().clear();
-			getActionConfiguration().addAll((Collection<? extends ViewActionConfiguration>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			getActionConfiguration().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION:
-			return actionConfiguration != null && !actionConfiguration.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-} // AspectViewTypeConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ConfigurationElementImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ConfigurationElementImpl.java
deleted file mode 100644
index 9048852af38..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ConfigurationElementImpl.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Configuration Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getDescription <em>Description</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getIdentifier <em>Identifier</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ConfigurationElementImpl#getIconEntry <em>Icon Entry</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ConfigurationElementImpl extends EObjectImpl implements ConfigurationElement {
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getIdentifier()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String IDENTIFIER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getIdentifier()
-	 * @generated
-	 * @ordered
-	 */
-	protected String identifier = IDENTIFIER_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getIconEntry() <em>Icon Entry</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getIconEntry()
-	 * @generated
-	 * @ordered
-	 */
-	protected IconEntry iconEntry;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ConfigurationElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getConfigurationElement();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME, oldName, name));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION, oldDescription, description));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getIdentifier() {
-		return identifier;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setIdentifier(String newIdentifier) {
-		String oldIdentifier = identifier;
-		identifier = newIdentifier;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER, oldIdentifier, identifier));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IconEntry getIconEntry() {
-		return iconEntry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public NotificationChain basicSetIconEntry(IconEntry newIconEntry, NotificationChain msgs) {
-		IconEntry oldIconEntry = iconEntry;
-		iconEntry = newIconEntry;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, oldIconEntry, newIconEntry);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setIconEntry(IconEntry newIconEntry) {
-		if (newIconEntry != iconEntry) {
-			NotificationChain msgs = null;
-			if (iconEntry != null) {
-				msgs = ((InternalEObject) iconEntry).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, null, msgs);
-			}
-			if (newIconEntry != null) {
-				msgs = ((InternalEObject) newIconEntry).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, null, msgs);
-			}
-			msgs = basicSetIconEntry(newIconEntry, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY, newIconEntry, newIconEntry));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
-			return basicSetIconEntry(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:
-			return getName();
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
-			return getDescription();
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:
-			return getIdentifier();
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
-			return getIconEntry();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:
-			setName((String) newValue);
-			return;
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
-			setDescription((String) newValue);
-			return;
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:
-			setIdentifier((String) newValue);
-			return;
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
-			setIconEntry((IconEntry) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:
-			setName(NAME_EDEFAULT);
-			return;
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
-			setDescription(DESCRIPTION_EDEFAULT);
-			return;
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:
-			setIdentifier(IDENTIFIER_EDEFAULT);
-			return;
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
-			setIconEntry((IconEntry) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__NAME:
-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
-			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__IDENTIFIER:
-			return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT__ICON_ENTRY:
-			return iconEntry != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(", description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", identifier: "); //$NON-NLS-1$
-		result.append(identifier);
-		result.append(')');
-		return result.toString();
-	}
-} // ConfigurationElementImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeAdviceConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeAdviceConfigurationImpl.java
deleted file mode 100644
index f6abe268d39..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeAdviceConfigurationImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element Type Advice Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ElementTypeAdviceConfigurationImpl extends ConfigurationElementImpl implements ElementTypeAdviceConfiguration {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ElementTypeAdviceConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getElementTypeAdviceConfiguration();
-	}
-} // ElementTypeAdviceConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeConfigurationImpl.java
deleted file mode 100644
index 1b51e373ab4..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ElementTypeConfigurationImpl.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getHint <em>Hint</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getKindName <em>Kind Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getSpecializedTypesID <em>Specialized Types ID</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ElementTypeConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ElementTypeConfigurationImpl extends ConfigurationElementImpl implements ElementTypeConfiguration {
-
-	/**
-	 * The default value of the '{@link #getHint() <em>Hint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getHint()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HINT_EDEFAULT = "ExtendedElements"; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getHint() <em>Hint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getHint()
-	 * @generated
-	 * @ordered
-	 */
-	protected String hint = HINT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getKindName() <em>Kind Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getKindName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String KIND_NAME_EDEFAULT = "org.eclipse.gmf.runtime.emf.type.core.IHintedType"; //$NON-NLS-1$
-
-	/**
-	 * The cached value of the '{@link #getKindName() <em>Kind Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getKindName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String kindName = KIND_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSpecializedTypesID() <em>Specialized Types ID</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getSpecializedTypesID()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<String> specializedTypesID;
-
-	/**
-	 * The cached value of the '{@link #getMatcherConfiguration() <em>Matcher Configuration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getMatcherConfiguration()
-	 * @generated
-	 * @ordered
-	 */
-	protected MatcherConfiguration matcherConfiguration;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ElementTypeConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getElementTypeConfiguration();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getHint() {
-		return hint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setHint(String newHint) {
-		String oldHint = hint;
-		hint = newHint;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT, oldHint, hint));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getKindName() {
-		return kindName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setKindName(String newKindName) {
-		String oldKindName = kindName;
-		kindName = newKindName;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME, oldKindName, kindName));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EList<String> getSpecializedTypesID() {
-		if (specializedTypesID == null) {
-			specializedTypesID = new EDataTypeUniqueEList<String>(String.class, this, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID);
-		}
-		return specializedTypesID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public MatcherConfiguration getMatcherConfiguration() {
-		return matcherConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public NotificationChain basicSetMatcherConfiguration(MatcherConfiguration newMatcherConfiguration, NotificationChain msgs) {
-		MatcherConfiguration oldMatcherConfiguration = matcherConfiguration;
-		matcherConfiguration = newMatcherConfiguration;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, oldMatcherConfiguration, newMatcherConfiguration);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setMatcherConfiguration(MatcherConfiguration newMatcherConfiguration) {
-		if (newMatcherConfiguration != matcherConfiguration) {
-			NotificationChain msgs = null;
-			if (matcherConfiguration != null) {
-				msgs = ((InternalEObject) matcherConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
-			}
-			if (newMatcherConfiguration != null) {
-				msgs = ((InternalEObject) newMatcherConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
-			}
-			msgs = basicSetMatcherConfiguration(newMatcherConfiguration, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, newMatcherConfiguration, newMatcherConfiguration));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
-			return basicSetMatcherConfiguration(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
-			return getHint();
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:
-			return getKindName();
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
-			return getSpecializedTypesID();
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
-			return getMatcherConfiguration();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
-			setHint((String) newValue);
-			return;
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:
-			setKindName((String) newValue);
-			return;
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
-			getSpecializedTypesID().clear();
-			getSpecializedTypesID().addAll((Collection<? extends String>) newValue);
-			return;
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
-			setMatcherConfiguration((MatcherConfiguration) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
-			setHint(HINT_EDEFAULT);
-			return;
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:
-			setKindName(KIND_NAME_EDEFAULT);
-			return;
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
-			getSpecializedTypesID().clear();
-			return;
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
-			setMatcherConfiguration((MatcherConfiguration) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
-			return HINT_EDEFAULT == null ? hint != null : !HINT_EDEFAULT.equals(hint);
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__KIND_NAME:
-			return KIND_NAME_EDEFAULT == null ? kindName != null : !KIND_NAME_EDEFAULT.equals(kindName);
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
-			return specializedTypesID != null && !specializedTypesID.isEmpty();
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
-			return matcherConfiguration != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (hint: "); //$NON-NLS-1$
-		result.append(hint);
-		result.append(", kindName: "); //$NON-NLS-1$
-		result.append(kindName);
-		result.append(", specializedTypesID: "); //$NON-NLS-1$
-		result.append(specializedTypesID);
-		result.append(')');
-		return result.toString();
-	}
-} // ElementTypeConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedElementTypeSetImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedElementTypeSetImpl.java
deleted file mode 100644
index 6e9ad76d6ce..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedElementTypeSetImpl.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extended Element Type Set</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl#getElementType <em>Element Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ExtendedElementTypeSetImpl#isExtensible <em>Extensible</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExtendedElementTypeSetImpl extends ConfigurationElementImpl implements ExtendedElementTypeSet {
-
-	/**
-	 * The cached value of the '{@link #getElementType() <em>Element Type</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getElementType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ElementTypeConfiguration> elementType;
-
-	/**
-	 * The default value of the '{@link #isExtensible() <em>Extensible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #isExtensible()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXTENSIBLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isExtensible() <em>Extensible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #isExtensible()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean extensible = EXTENSIBLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ExtendedElementTypeSetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getExtendedElementTypeSet();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EList<ElementTypeConfiguration> getElementType() {
-		if (elementType == null) {
-			elementType = new EObjectContainmentEList<ElementTypeConfiguration>(ElementTypeConfiguration.class, this, ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE);
-		}
-		return elementType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public boolean isExtensible() {
-		return extensible;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setExtensible(boolean newExtensible) {
-		boolean oldExtensible = extensible;
-		extensible = newExtensible;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE, oldExtensible, extensible));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
-			return ((InternalEList<?>) getElementType()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
-			return getElementType();
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:
-			return isExtensible();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
-			getElementType().clear();
-			getElementType().addAll((Collection<? extends ElementTypeConfiguration>) newValue);
-			return;
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:
-			setExtensible((Boolean) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
-			getElementType().clear();
-			return;
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:
-			setExtensible(EXTENSIBLE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE:
-			return elementType != null && !elementType.isEmpty();
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE:
-			return extensible != EXTENSIBLE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (extensible: "); //$NON-NLS-1$
-		result.append(extensible);
-		result.append(')');
-		return result.toString();
-	}
-} // ExtendedElementTypeSetImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesFactoryImpl.java
deleted file mode 100644
index adecf7571b8..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesFactoryImpl.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ExtendedtypesFactoryImpl extends EFactoryImpl implements ExtendedtypesFactory {
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static ExtendedtypesFactory init() {
-		try {
-			ExtendedtypesFactory theExtendedtypesFactory = (ExtendedtypesFactory) EPackage.Registry.INSTANCE.getEFactory(ExtendedtypesPackage.eNS_URI);
-			if (theExtendedtypesFactory != null) {
-				return theExtendedtypesFactory;
-			}
-		} catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ExtendedtypesFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedtypesFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET:
-			return createExtendedElementTypeSet();
-		case ExtendedtypesPackage.ICON_ENTRY:
-			return createIconEntry();
-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION:
-			return createAspectSemanticTypeConfiguration();
-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION:
-			return createAspectViewTypeConfiguration();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedElementTypeSet createExtendedElementTypeSet() {
-		ExtendedElementTypeSetImpl extendedElementTypeSet = new ExtendedElementTypeSetImpl();
-		return extendedElementTypeSet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IconEntry createIconEntry() {
-		IconEntryImpl iconEntry = new IconEntryImpl();
-		return iconEntry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public AspectSemanticTypeConfiguration createAspectSemanticTypeConfiguration() {
-		AspectSemanticTypeConfigurationImpl aspectSemanticTypeConfiguration = new AspectSemanticTypeConfigurationImpl();
-		return aspectSemanticTypeConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public AspectViewTypeConfiguration createAspectViewTypeConfiguration() {
-		AspectViewTypeConfigurationImpl aspectViewTypeConfiguration = new AspectViewTypeConfigurationImpl();
-		return aspectViewTypeConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedtypesPackage getExtendedtypesPackage() {
-		return (ExtendedtypesPackage) getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static ExtendedtypesPackage getPackage() {
-		return ExtendedtypesPackage.eINSTANCE;
-	}
-} // ExtendedtypesFactoryImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesPackageImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesPackageImpl.java
deleted file mode 100644
index 06588cce800..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ExtendedtypesPackageImpl.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesFactory;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ExtendedtypesPackageImpl extends EPackageImpl implements ExtendedtypesPackage {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass extendedElementTypeSetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass elementTypeConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass iconEntryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass configurationElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass matcherConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass actionConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass viewActionConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass semanticActionConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass semanticTypeConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass viewTypeConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass elementTypeAdviceConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass aspectSemanticTypeConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass aspectViewTypeConfigurationEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
-	 * package
-	 * package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ExtendedtypesPackageImpl() {
-		super(eNS_URI, ExtendedtypesFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
-	 * <p>
-	 * This method is used to initialize {@link ExtendedtypesPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ExtendedtypesPackage init() {
-		if (isInited) {
-			return (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);
-		}
-		// Obtain or create and register package
-		ExtendedtypesPackageImpl theExtendedtypesPackage = (ExtendedtypesPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ExtendedtypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ExtendedtypesPackageImpl());
-		isInited = true;
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		// Create package meta-data objects
-		theExtendedtypesPackage.createPackageContents();
-		// Initialize created meta-data
-		theExtendedtypesPackage.initializePackageContents();
-		// Mark meta-data to indicate it can't be changed
-		theExtendedtypesPackage.freeze();
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(ExtendedtypesPackage.eNS_URI, theExtendedtypesPackage);
-		return theExtendedtypesPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getExtendedElementTypeSet() {
-		return extendedElementTypeSetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EReference getExtendedElementTypeSet_ElementType() {
-		return (EReference) extendedElementTypeSetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getExtendedElementTypeSet_Extensible() {
-		return (EAttribute) extendedElementTypeSetEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getElementTypeConfiguration() {
-		return elementTypeConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getElementTypeConfiguration_Hint() {
-		return (EAttribute) elementTypeConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getElementTypeConfiguration_KindName() {
-		return (EAttribute) elementTypeConfigurationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getElementTypeConfiguration_SpecializedTypesID() {
-		return (EAttribute) elementTypeConfigurationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EReference getElementTypeConfiguration_MatcherConfiguration() {
-		return (EReference) elementTypeConfigurationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getIconEntry() {
-		return iconEntryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getIconEntry_IconPath() {
-		return (EAttribute) iconEntryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getIconEntry_BundleId() {
-		return (EAttribute) iconEntryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getConfigurationElement() {
-		return configurationElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getConfigurationElement_Name() {
-		return (EAttribute) configurationElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getConfigurationElement_Description() {
-		return (EAttribute) configurationElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getConfigurationElement_Identifier() {
-		return (EAttribute) configurationElementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EReference getConfigurationElement_IconEntry() {
-		return (EReference) configurationElementEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getMatcherConfiguration() {
-		return matcherConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getActionConfiguration() {
-		return actionConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getViewActionConfiguration() {
-		return viewActionConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getSemanticActionConfiguration() {
-		return semanticActionConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getSemanticTypeConfiguration() {
-		return semanticTypeConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getViewTypeConfiguration() {
-		return viewTypeConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getViewTypeConfiguration_SpecializedDiagramTypeID() {
-		return (EAttribute) viewTypeConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getElementTypeAdviceConfiguration() {
-		return elementTypeAdviceConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getAspectSemanticTypeConfiguration() {
-		return aspectSemanticTypeConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EReference getAspectSemanticTypeConfiguration_ActionConfiguration() {
-		return (EReference) aspectSemanticTypeConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getAspectViewTypeConfiguration() {
-		return aspectViewTypeConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EReference getAspectViewTypeConfiguration_ActionConfiguration() {
-		return (EReference) aspectViewTypeConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedtypesFactory getExtendedtypesFactory() {
-		return (ExtendedtypesFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package. This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) {
-			return;
-		}
-		isCreated = true;
-		// Create classes and their features
-		extendedElementTypeSetEClass = createEClass(EXTENDED_ELEMENT_TYPE_SET);
-		createEReference(extendedElementTypeSetEClass, EXTENDED_ELEMENT_TYPE_SET__ELEMENT_TYPE);
-		createEAttribute(extendedElementTypeSetEClass, EXTENDED_ELEMENT_TYPE_SET__EXTENSIBLE);
-		elementTypeConfigurationEClass = createEClass(ELEMENT_TYPE_CONFIGURATION);
-		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__HINT);
-		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__KIND_NAME);
-		createEAttribute(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID);
-		createEReference(elementTypeConfigurationEClass, ELEMENT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION);
-		iconEntryEClass = createEClass(ICON_ENTRY);
-		createEAttribute(iconEntryEClass, ICON_ENTRY__ICON_PATH);
-		createEAttribute(iconEntryEClass, ICON_ENTRY__BUNDLE_ID);
-		configurationElementEClass = createEClass(CONFIGURATION_ELEMENT);
-		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__NAME);
-		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__DESCRIPTION);
-		createEAttribute(configurationElementEClass, CONFIGURATION_ELEMENT__IDENTIFIER);
-		createEReference(configurationElementEClass, CONFIGURATION_ELEMENT__ICON_ENTRY);
-		matcherConfigurationEClass = createEClass(MATCHER_CONFIGURATION);
-		actionConfigurationEClass = createEClass(ACTION_CONFIGURATION);
-		viewActionConfigurationEClass = createEClass(VIEW_ACTION_CONFIGURATION);
-		semanticActionConfigurationEClass = createEClass(SEMANTIC_ACTION_CONFIGURATION);
-		semanticTypeConfigurationEClass = createEClass(SEMANTIC_TYPE_CONFIGURATION);
-		viewTypeConfigurationEClass = createEClass(VIEW_TYPE_CONFIGURATION);
-		createEAttribute(viewTypeConfigurationEClass, VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID);
-		elementTypeAdviceConfigurationEClass = createEClass(ELEMENT_TYPE_ADVICE_CONFIGURATION);
-		aspectSemanticTypeConfigurationEClass = createEClass(ASPECT_SEMANTIC_TYPE_CONFIGURATION);
-		createEReference(aspectSemanticTypeConfigurationEClass, ASPECT_SEMANTIC_TYPE_CONFIGURATION__ACTION_CONFIGURATION);
-		aspectViewTypeConfigurationEClass = createEClass(ASPECT_VIEW_TYPE_CONFIGURATION);
-		createEReference(aspectViewTypeConfigurationEClass, ASPECT_VIEW_TYPE_CONFIGURATION__ACTION_CONFIGURATION);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model. This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) {
-			return;
-		}
-		isInitialized = true;
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-		// Create type parameters
-		// Set bounds for type parameters
-		// Add supertypes to classes
-		extendedElementTypeSetEClass.getESuperTypes().add(this.getConfigurationElement());
-		elementTypeConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());
-		actionConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());
-		viewActionConfigurationEClass.getESuperTypes().add(this.getActionConfiguration());
-		semanticActionConfigurationEClass.getESuperTypes().add(this.getActionConfiguration());
-		semanticTypeConfigurationEClass.getESuperTypes().add(this.getElementTypeConfiguration());
-		viewTypeConfigurationEClass.getESuperTypes().add(this.getElementTypeConfiguration());
-		elementTypeAdviceConfigurationEClass.getESuperTypes().add(this.getConfigurationElement());
-		aspectSemanticTypeConfigurationEClass.getESuperTypes().add(this.getSemanticTypeConfiguration());
-		aspectViewTypeConfigurationEClass.getESuperTypes().add(this.getViewTypeConfiguration());
-		// Initialize classes and features; add operations and parameters
-		initEClass(extendedElementTypeSetEClass, ExtendedElementTypeSet.class, "ExtendedElementTypeSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getExtendedElementTypeSet_ElementType(), this.getElementTypeConfiguration(), null,
-				"elementType", null, 1, -1, ExtendedElementTypeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getExtendedElementTypeSet_Extensible(), theEcorePackage.getEBoolean(), "extensible", null, 0, 1, ExtendedElementTypeSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEClass(elementTypeConfigurationEClass, ElementTypeConfiguration.class, "ElementTypeConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getElementTypeConfiguration_Hint(), ecorePackage.getEString(), "hint", "ExtendedElements", 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getElementTypeConfiguration_KindName(), ecorePackage.getEString(),
-				"kindName", "org.eclipse.gmf.runtime.emf.type.core.IHintedType", 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getElementTypeConfiguration_SpecializedTypesID(), ecorePackage.getEString(),
-				"specializedTypesID", null, 1, -1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getElementTypeConfiguration_MatcherConfiguration(), this.getMatcherConfiguration(), null,
-				"matcherConfiguration", null, 0, 1, ElementTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEClass(iconEntryEClass, IconEntry.class, "IconEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getIconEntry_IconPath(), ecorePackage.getEString(), "iconPath", null, 0, 1, IconEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getIconEntry_BundleId(), ecorePackage.getEString(), "bundleId", null, 0, 1, IconEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEClass(configurationElementEClass, ConfigurationElement.class, "ConfigurationElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getConfigurationElement_Name(), theEcorePackage.getEString(), "name", null, 1, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getConfigurationElement_Description(), theEcorePackage.getEString(), "description", null, 0, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getConfigurationElement_Identifier(), theEcorePackage.getEString(), "identifier", null, 1, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getConfigurationElement_IconEntry(), this.getIconEntry(), null,
-				"iconEntry", null, 0, 1, ConfigurationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEClass(matcherConfigurationEClass, MatcherConfiguration.class, "MatcherConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEClass(actionConfigurationEClass, ActionConfiguration.class, "ActionConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEClass(viewActionConfigurationEClass, ViewActionConfiguration.class, "ViewActionConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEClass(semanticActionConfigurationEClass, SemanticActionConfiguration.class, "SemanticActionConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEClass(semanticTypeConfigurationEClass, SemanticTypeConfiguration.class, "SemanticTypeConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEClass(viewTypeConfigurationEClass, ViewTypeConfiguration.class, "ViewTypeConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getViewTypeConfiguration_SpecializedDiagramTypeID(), ecorePackage.getEString(),
-				"specializedDiagramTypeID", null, 0, 1, ViewTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEClass(elementTypeAdviceConfigurationEClass, ElementTypeAdviceConfiguration.class, "ElementTypeAdviceConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEClass(aspectSemanticTypeConfigurationEClass, AspectSemanticTypeConfiguration.class, "AspectSemanticTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getAspectSemanticTypeConfiguration_ActionConfiguration(), this.getSemanticActionConfiguration(), null,
-				"actionConfiguration", null, 0, -1, AspectSemanticTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEClass(aspectViewTypeConfigurationEClass, AspectViewTypeConfiguration.class, "AspectViewTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getAspectViewTypeConfiguration_ActionConfiguration(), this.getViewActionConfiguration(), null,
-				"actionConfiguration", null, 0, -1, AspectViewTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		// Create resource
-		createResource(eNS_URI);
-	}
-} // ExtendedtypesPackageImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/IconEntryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/IconEntryImpl.java
deleted file mode 100644
index d62dbe78983..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/IconEntryImpl.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Icon Entry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl#getIconPath <em>Icon Path</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.IconEntryImpl#getBundleId <em>Bundle Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IconEntryImpl extends EObjectImpl implements IconEntry {
-
-	/**
-	 * The default value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getIconPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ICON_PATH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getIconPath() <em>Icon Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getIconPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected String iconPath = ICON_PATH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBundleId() <em>Bundle Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getBundleId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String BUNDLE_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getBundleId() <em>Bundle Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getBundleId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String bundleId = BUNDLE_ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IconEntryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getIconEntry();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getIconPath() {
-		return iconPath;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setIconPath(String newIconPath) {
-		String oldIconPath = iconPath;
-		iconPath = newIconPath;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ICON_ENTRY__ICON_PATH, oldIconPath, iconPath));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getBundleId() {
-		return bundleId;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setBundleId(String newBundleId) {
-		String oldBundleId = bundleId;
-		bundleId = newBundleId;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID, oldBundleId, bundleId));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:
-			return getIconPath();
-		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:
-			return getBundleId();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:
-			setIconPath((String) newValue);
-			return;
-		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:
-			setBundleId((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:
-			setIconPath(ICON_PATH_EDEFAULT);
-			return;
-		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:
-			setBundleId(BUNDLE_ID_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.ICON_ENTRY__ICON_PATH:
-			return ICON_PATH_EDEFAULT == null ? iconPath != null : !ICON_PATH_EDEFAULT.equals(iconPath);
-		case ExtendedtypesPackage.ICON_ENTRY__BUNDLE_ID:
-			return BUNDLE_ID_EDEFAULT == null ? bundleId != null : !BUNDLE_ID_EDEFAULT.equals(bundleId);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (iconPath: "); //$NON-NLS-1$
-		result.append(iconPath);
-		result.append(", bundleId: "); //$NON-NLS-1$
-		result.append(bundleId);
-		result.append(')');
-		return result.toString();
-	}
-} // IconEntryImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/MatcherConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/MatcherConfigurationImpl.java
deleted file mode 100644
index 9c520ab6a30..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/MatcherConfigurationImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Matcher Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class MatcherConfigurationImpl extends EObjectImpl implements MatcherConfiguration {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected MatcherConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getMatcherConfiguration();
-	}
-} // MatcherConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticActionConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticActionConfigurationImpl.java
deleted file mode 100644
index 2cb3eb92817..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticActionConfigurationImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Semantic Action Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class SemanticActionConfigurationImpl extends ActionConfigurationImpl implements SemanticActionConfiguration {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected SemanticActionConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getSemanticActionConfiguration();
-	}
-} // SemanticActionConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticTypeConfigurationImpl.java
deleted file mode 100644
index 596422f305b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/SemanticTypeConfigurationImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Semantic Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class SemanticTypeConfigurationImpl extends ElementTypeConfigurationImpl implements SemanticTypeConfiguration {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected SemanticTypeConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getSemanticTypeConfiguration();
-	}
-} // SemanticTypeConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewActionConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewActionConfigurationImpl.java
deleted file mode 100644
index 820853416ae..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewActionConfigurationImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>View Action Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class ViewActionConfigurationImpl extends ActionConfigurationImpl implements ViewActionConfiguration {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ViewActionConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getViewActionConfiguration();
-	}
-} // ViewActionConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewTypeConfigurationImpl.java
deleted file mode 100644
index f94129eb43a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/impl/ViewTypeConfigurationImpl.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>View Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.impl.ViewTypeConfigurationImpl#getSpecializedDiagramTypeID <em>Specialized Diagram Type ID</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ViewTypeConfigurationImpl extends ElementTypeConfigurationImpl implements ViewTypeConfiguration {
-
-	/**
-	 * The default value of the '{@link #getSpecializedDiagramTypeID() <em>Specialized Diagram Type ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getSpecializedDiagramTypeID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSpecializedDiagramTypeID() <em>Specialized Diagram Type ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getSpecializedDiagramTypeID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String specializedDiagramTypeID = SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ViewTypeConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ExtendedtypesPackage.eINSTANCE.getViewTypeConfiguration();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getSpecializedDiagramTypeID() {
-		return specializedDiagramTypeID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setSpecializedDiagramTypeID(String newSpecializedDiagramTypeID) {
-		String oldSpecializedDiagramTypeID = specializedDiagramTypeID;
-		specializedDiagramTypeID = newSpecializedDiagramTypeID;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID, oldSpecializedDiagramTypeID, specializedDiagramTypeID));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:
-			return getSpecializedDiagramTypeID();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:
-			setSpecializedDiagramTypeID((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:
-			setSpecializedDiagramTypeID(SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION__SPECIALIZED_DIAGRAM_TYPE_ID:
-			return SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT == null ? specializedDiagramTypeID != null : !SPECIALIZED_DIAGRAM_TYPE_ID_EDEFAULT.equals(specializedDiagramTypeID);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (specializedDiagramTypeID: "); //$NON-NLS-1$
-		result.append(specializedDiagramTypeID);
-		result.append(')');
-		return result.toString();
-	}
-} // ViewTypeConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/HierarchyPermission.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/HierarchyPermission.java
deleted file mode 100644
index 638808816cc..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/HierarchyPermission.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Hierarchy Permission</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission()
- * @model
- * @generated
- */
-public interface HierarchyPermission extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Child Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Child Type</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Child Type</em>' attribute.
-	 * @see #setChildType(String)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission_ChildType()
-	 * @model
-	 * @generated
-	 */
-	String getChildType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Child Type</em>' attribute.
-	 * @see #getChildType()
-	 * @generated
-	 */
-	void setChildType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Is Permitted</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is Permitted</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Is Permitted</em>' attribute.
-	 * @see #setIsPermitted(boolean)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission_IsPermitted()
-	 * @model
-	 * @generated
-	 */
-	boolean isIsPermitted();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Is Permitted</em>' attribute.
-	 * @see #isIsPermitted()
-	 * @generated
-	 */
-	void setIsPermitted(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Is Strict</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is Strict</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Is Strict</em>' attribute.
-	 * @see #setIsStrict(boolean)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getHierarchyPermission_IsStrict()
-	 * @model
-	 * @generated
-	 */
-	boolean isIsStrict();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Is Strict</em>' attribute.
-	 * @see #isIsStrict()
-	 * @generated
-	 */
-	void setIsStrict(boolean value);
-
-} // HierarchyPermission
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfiguration.java
deleted file mode 100644
index 51b3b875bca..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfiguration.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Invariant Container Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration#getPermissions <em>Permissions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getInvariantContainerConfiguration()
- * @model
- * @generated
- */
-public interface InvariantContainerConfiguration extends InvariantRuleConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Permissions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Permissions</em>' containment reference list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Permissions</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#getInvariantContainerConfiguration_Permissions()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<HierarchyPermission> getPermissions();
-
-} // InvariantContainerConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationFactory.java
deleted file mode 100644
index d323c3a99e0..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage
- * @generated
- */
-public interface InvariantContainerConfigurationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	InvariantContainerConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Invariant Container Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Invariant Container Configuration</em>'.
-	 * @generated
-	 */
-	InvariantContainerConfiguration createInvariantContainerConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>Hierarchy Permission</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Hierarchy Permission</em>'.
-	 * @generated
-	 */
-	HierarchyPermission createHierarchyPermission();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	InvariantContainerConfigurationPackage getInvariantContainerConfigurationPackage();
-
-} // InvariantContainerConfigurationFactory
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationPackage.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationPackage.java
deleted file mode 100644
index b2c47c6441e..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationPackage.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory
- * @model kind="package"
- * @generated
- */
-public interface InvariantContainerConfigurationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNAME = "invariantcontainerconfiguration";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_PREFIX = "invariantcontainerconfiguration";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	InvariantContainerConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl <em>Invariant Container Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getInvariantContainerConfiguration()
-	 * @generated
-	 */
-	int INVARIANT_CONTAINER_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Permissions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Invariant Container Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_CONTAINER_CONFIGURATION_FEATURE_COUNT = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Invariant Container Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_CONTAINER_CONFIGURATION_OPERATION_COUNT = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl <em>Hierarchy Permission</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getHierarchyPermission()
-	 * @generated
-	 */
-	int HIERARCHY_PERMISSION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Child Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int HIERARCHY_PERMISSION__CHILD_TYPE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Is Permitted</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int HIERARCHY_PERMISSION__IS_PERMITTED = 1;
-
-	/**
-	 * The feature id for the '<em><b>Is Strict</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int HIERARCHY_PERMISSION__IS_STRICT = 2;
-
-	/**
-	 * The number of structural features of the '<em>Hierarchy Permission</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int HIERARCHY_PERMISSION_FEATURE_COUNT = 3;
-
-	/**
-	 * The number of operations of the '<em>Hierarchy Permission</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int HIERARCHY_PERMISSION_OPERATION_COUNT = 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration <em>Invariant Container Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Invariant Container Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration
-	 * @generated
-	 */
-	EClass getInvariantContainerConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration#getPermissions <em>Permissions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Permissions</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration#getPermissions()
-	 * @see #getInvariantContainerConfiguration()
-	 * @generated
-	 */
-	EReference getInvariantContainerConfiguration_Permissions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission <em>Hierarchy Permission</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Hierarchy Permission</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission
-	 * @generated
-	 */
-	EClass getHierarchyPermission();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType <em>Child Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Child Type</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#getChildType()
-	 * @see #getHierarchyPermission()
-	 * @generated
-	 */
-	EAttribute getHierarchyPermission_ChildType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted <em>Is Permitted</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Is Permitted</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsPermitted()
-	 * @see #getHierarchyPermission()
-	 * @generated
-	 */
-	EAttribute getHierarchyPermission_IsPermitted();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict <em>Is Strict</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Is Strict</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission#isIsStrict()
-	 * @see #getHierarchyPermission()
-	 * @generated
-	 */
-	EAttribute getHierarchyPermission_IsStrict();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	InvariantContainerConfigurationFactory getInvariantContainerConfigurationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 * <li>each class,</li>
-	 * <li>each feature of each class,</li>
-	 * <li>each operation of each class,</li>
-	 * <li>each enum,</li>
-	 * <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl <em>Invariant Container Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getInvariantContainerConfiguration()
-		 * @generated
-		 */
-		EClass INVARIANT_CONTAINER_CONFIGURATION = eINSTANCE.getInvariantContainerConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Permissions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS = eINSTANCE.getInvariantContainerConfiguration_Permissions();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl <em>Hierarchy Permission</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationPackageImpl#getHierarchyPermission()
-		 * @generated
-		 */
-		EClass HIERARCHY_PERMISSION = eINSTANCE.getHierarchyPermission();
-
-		/**
-		 * The meta object literal for the '<em><b>Child Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute HIERARCHY_PERMISSION__CHILD_TYPE = eINSTANCE.getHierarchyPermission_ChildType();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Permitted</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute HIERARCHY_PERMISSION__IS_PERMITTED = eINSTANCE.getHierarchyPermission_IsPermitted();
-
-		/**
-		 * The meta object literal for the '<em><b>Is Strict</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute HIERARCHY_PERMISSION__IS_STRICT = eINSTANCE.getHierarchyPermission_IsStrict();
-
-	}
-
-} // InvariantContainerConfigurationPackage
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/HierarchyPermissionImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/HierarchyPermissionImpl.java
deleted file mode 100644
index 3a592474fb0..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/HierarchyPermissionImpl.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Hierarchy Permission</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl#getChildType <em>Child Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl#isIsPermitted <em>Is Permitted</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.HierarchyPermissionImpl#isIsStrict <em>Is Strict</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implements HierarchyPermission {
-	/**
-	 * The default value of the '{@link #getChildType() <em>Child Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getChildType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CHILD_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getChildType() <em>Child Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getChildType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String childType = CHILD_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isIsPermitted() <em>Is Permitted</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #isIsPermitted()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_PERMITTED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsPermitted() <em>Is Permitted</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #isIsPermitted()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isPermitted = IS_PERMITTED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isIsStrict() <em>Is Strict</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #isIsStrict()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_STRICT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsStrict() <em>Is Strict</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #isIsStrict()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isStrict = IS_STRICT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected HierarchyPermissionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return InvariantContainerConfigurationPackage.Literals.HIERARCHY_PERMISSION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getChildType() {
-		return childType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setChildType(String newChildType) {
-		String oldChildType = childType;
-		childType = newChildType;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE, oldChildType, childType));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public boolean isIsPermitted() {
-		return isPermitted;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setIsPermitted(boolean newIsPermitted) {
-		boolean oldIsPermitted = isPermitted;
-		isPermitted = newIsPermitted;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED, oldIsPermitted, isPermitted));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public boolean isIsStrict() {
-		return isStrict;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setIsStrict(boolean newIsStrict) {
-		boolean oldIsStrict = isStrict;
-		isStrict = newIsStrict;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT, oldIsStrict, isStrict));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
-			return getChildType();
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
-			return isIsPermitted();
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
-			return isIsStrict();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
-			setChildType((String) newValue);
-			return;
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
-			setIsPermitted((Boolean) newValue);
-			return;
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
-			setIsStrict((Boolean) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
-			setChildType(CHILD_TYPE_EDEFAULT);
-			return;
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
-			setIsPermitted(IS_PERMITTED_EDEFAULT);
-			return;
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
-			setIsStrict(IS_STRICT_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__CHILD_TYPE:
-			return CHILD_TYPE_EDEFAULT == null ? childType != null : !CHILD_TYPE_EDEFAULT.equals(childType);
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_PERMITTED:
-			return isPermitted != IS_PERMITTED_EDEFAULT;
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION__IS_STRICT:
-			return isStrict != IS_STRICT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (childType: ");
-		result.append(childType);
-		result.append(", isPermitted: ");
-		result.append(isPermitted);
-		result.append(", isStrict: ");
-		result.append(isStrict);
-		result.append(')');
-		return result.toString();
-	}
-
-} // HierarchyPermissionImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationFactoryImpl.java
deleted file mode 100644
index 26d77cdf80b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantContainerConfigurationFactoryImpl extends EFactoryImpl implements InvariantContainerConfigurationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static InvariantContainerConfigurationFactory init() {
-		try {
-			InvariantContainerConfigurationFactory theInvariantContainerConfigurationFactory = (InvariantContainerConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(InvariantContainerConfigurationPackage.eNS_URI);
-			if (theInvariantContainerConfigurationFactory != null) {
-				return theInvariantContainerConfigurationFactory;
-			}
-		} catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new InvariantContainerConfigurationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantContainerConfigurationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION:
-			return createInvariantContainerConfiguration();
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION:
-			return createHierarchyPermission();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantContainerConfiguration createInvariantContainerConfiguration() {
-		InvariantContainerConfigurationImpl invariantContainerConfiguration = new InvariantContainerConfigurationImpl();
-		return invariantContainerConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public HierarchyPermission createHierarchyPermission() {
-		HierarchyPermissionImpl hierarchyPermission = new HierarchyPermissionImpl();
-		return hierarchyPermission;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantContainerConfigurationPackage getInvariantContainerConfigurationPackage() {
-		return (InvariantContainerConfigurationPackage) getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static InvariantContainerConfigurationPackage getPackage() {
-		return InvariantContainerConfigurationPackage.eINSTANCE;
-	}
-
-} // InvariantContainerConfigurationFactoryImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationImpl.java
deleted file mode 100644
index 0b5d9867055..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Invariant Container Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl.InvariantContainerConfigurationImpl#getPermissions <em>Permissions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InvariantContainerConfigurationImpl extends InvariantRuleConfigurationImpl implements InvariantContainerConfiguration {
-	/**
-	 * The cached value of the '{@link #getPermissions() <em>Permissions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getPermissions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<HierarchyPermission> permissions;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected InvariantContainerConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return InvariantContainerConfigurationPackage.Literals.INVARIANT_CONTAINER_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EList<HierarchyPermission> getPermissions() {
-		if (permissions == null) {
-			permissions = new EObjectContainmentEList<HierarchyPermission>(HierarchyPermission.class, this, InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS);
-		}
-		return permissions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
-			return ((InternalEList<?>) getPermissions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
-			return getPermissions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
-			getPermissions().clear();
-			getPermissions().addAll((Collection<? extends HierarchyPermission>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
-			getPermissions().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS:
-			return permissions != null && !permissions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // InvariantContainerConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationPackageImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationPackageImpl.java
deleted file mode 100644
index 7666a1ee9d4..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/impl/InvariantContainerConfigurationPackageImpl.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantContainerConfigurationPackageImpl extends EPackageImpl implements InvariantContainerConfigurationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass invariantContainerConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass hierarchyPermissionEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private InvariantContainerConfigurationPackageImpl() {
-		super(eNS_URI, InvariantContainerConfigurationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
-	 * <p>
-	 * This method is used to initialize {@link InvariantContainerConfigurationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static InvariantContainerConfigurationPackage init() {
-		if (isInited) {
-			return (InvariantContainerConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantContainerConfigurationPackage.eNS_URI);
-		}
-
-		// Obtain or create and register package
-		InvariantContainerConfigurationPackageImpl theInvariantContainerConfigurationPackage = (InvariantContainerConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InvariantContainerConfigurationPackageImpl ? EPackage.Registry.INSTANCE
-				.get(eNS_URI) : new InvariantContainerConfigurationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		InvariantSemanticTypeConfigurationPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theInvariantContainerConfigurationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theInvariantContainerConfigurationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theInvariantContainerConfigurationPackage.freeze();
-
-
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(InvariantContainerConfigurationPackage.eNS_URI, theInvariantContainerConfigurationPackage);
-		return theInvariantContainerConfigurationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getInvariantContainerConfiguration() {
-		return invariantContainerConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EReference getInvariantContainerConfiguration_Permissions() {
-		return (EReference) invariantContainerConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getHierarchyPermission() {
-		return hierarchyPermissionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getHierarchyPermission_ChildType() {
-		return (EAttribute) hierarchyPermissionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getHierarchyPermission_IsPermitted() {
-		return (EAttribute) hierarchyPermissionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getHierarchyPermission_IsStrict() {
-		return (EAttribute) hierarchyPermissionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantContainerConfigurationFactory getInvariantContainerConfigurationFactory() {
-		return (InvariantContainerConfigurationFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package. This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) {
-			return;
-		}
-		isCreated = true;
-
-		// Create classes and their features
-		invariantContainerConfigurationEClass = createEClass(INVARIANT_CONTAINER_CONFIGURATION);
-		createEReference(invariantContainerConfigurationEClass, INVARIANT_CONTAINER_CONFIGURATION__PERMISSIONS);
-
-		hierarchyPermissionEClass = createEClass(HIERARCHY_PERMISSION);
-		createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__CHILD_TYPE);
-		createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__IS_PERMITTED);
-		createEAttribute(hierarchyPermissionEClass, HIERARCHY_PERMISSION__IS_STRICT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model. This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) {
-			return;
-		}
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		InvariantSemanticTypeConfigurationPackage theInvariantSemanticTypeConfigurationPackage = (InvariantSemanticTypeConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantSemanticTypeConfigurationPackage.eNS_URI);
-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		invariantContainerConfigurationEClass.getESuperTypes().add(theInvariantSemanticTypeConfigurationPackage.getInvariantRuleConfiguration());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(invariantContainerConfigurationEClass, InvariantContainerConfiguration.class, "InvariantContainerConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getInvariantContainerConfiguration_Permissions(), this.getHierarchyPermission(), null, "permissions", null, 0, -1, InvariantContainerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(hierarchyPermissionEClass, HierarchyPermission.class, "HierarchyPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getHierarchyPermission_ChildType(), theEcorePackage.getEString(), "childType", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getHierarchyPermission_IsPermitted(), theEcorePackage.getEBoolean(), "isPermitted", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getHierarchyPermission_IsStrict(), theEcorePackage.getEBoolean(), "isStrict", null, 0, 1, HierarchyPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} // InvariantContainerConfigurationPackageImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationAdapterFactory.java
deleted file mode 100644
index 1253bb13014..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage
- * @generated
- */
-public class InvariantContainerConfigurationAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static InvariantContainerConfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantContainerConfigurationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = InvariantContainerConfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected InvariantContainerConfigurationSwitch<Adapter> modelSwitch =
-			new InvariantContainerConfigurationSwitch<Adapter>() {
-				@Override
-				public Adapter caseInvariantContainerConfiguration(InvariantContainerConfiguration object) {
-					return createInvariantContainerConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter caseHierarchyPermission(HierarchyPermission object) {
-					return createHierarchyPermissionAdapter();
-				}
-
-				@Override
-				public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
-					return createInvariantRuleConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter defaultCase(EObject object) {
-					return createEObjectAdapter();
-				}
-			};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param target
-	 *            the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration <em>Invariant Container Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration
-	 * @generated
-	 */
-	public Adapter createInvariantContainerConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission <em>Hierarchy Permission</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission
-	 * @generated
-	 */
-	public Adapter createHierarchyPermissionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration
-	 * @generated
-	 */
-	public Adapter createInvariantRuleConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} // InvariantContainerConfigurationAdapterFactory
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceFactoryImpl.java
deleted file mode 100644
index 6cc50cec89a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util.InvariantContainerConfigurationResourceImpl
- * @generated
- */
-public class InvariantContainerConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantContainerConfigurationResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Resource createResource(URI uri) {
-		Resource result = new InvariantContainerConfigurationResourceImpl(uri);
-		return result;
-	}
-
-} // InvariantContainerConfigurationResourceFactoryImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceImpl.java
deleted file mode 100644
index 6d28f7a6411..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationResourceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util.InvariantContainerConfigurationResourceFactoryImpl
- * @generated
- */
-public class InvariantContainerConfigurationResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param uri
-	 *            the URI of the new resource.
-	 * @generated
-	 */
-	public InvariantContainerConfigurationResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} // InvariantContainerConfigurationResourceImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationSwitch.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationSwitch.java
deleted file mode 100644
index 79da5323bc5..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationSwitch.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage
- * @generated
- */
-public class InvariantContainerConfigurationSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static InvariantContainerConfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantContainerConfigurationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = InvariantContainerConfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case InvariantContainerConfigurationPackage.INVARIANT_CONTAINER_CONFIGURATION: {
-			InvariantContainerConfiguration invariantContainerConfiguration = (InvariantContainerConfiguration) theEObject;
-			T result = caseInvariantContainerConfiguration(invariantContainerConfiguration);
-			if (result == null) {
-				result = caseInvariantRuleConfiguration(invariantContainerConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case InvariantContainerConfigurationPackage.HIERARCHY_PERMISSION: {
-			HierarchyPermission hierarchyPermission = (HierarchyPermission) theEObject;
-			T result = caseHierarchyPermission(hierarchyPermission);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Container Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Invariant Container Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseInvariantContainerConfiguration(InvariantContainerConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Hierarchy Permission</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Hierarchy Permission</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseHierarchyPermission(HierarchyPermission object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} // InvariantContainerConfigurationSwitch
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationXMLProcessor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationXMLProcessor.java
deleted file mode 100644
index 4cfa64fb687..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/util/InvariantContainerConfigurationXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration.InvariantContainerConfigurationPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantContainerConfigurationXMLProcessor extends XMLProcessor {
-
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantContainerConfigurationXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		InvariantContainerConfigurationPackage.eINSTANCE.eClass();
-	}
-
-	/**
-	 * Register for "*" and "xml" file extensions the InvariantContainerConfigurationResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new InvariantContainerConfigurationResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new InvariantContainerConfigurationResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} // InvariantContainerConfigurationXMLProcessor
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRule.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRule.java
deleted file mode 100644
index 79405d201c5..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>And Rule</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getAndRule()
- * @model
- * @generated
- */
-public interface AndRule extends ComposedRuleConfiguration {
-} // AndRule
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/ComposedRuleConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/ComposedRuleConfiguration.java
deleted file mode 100644
index a78e97f0b60..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/ComposedRuleConfiguration.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Composed Rule Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration#getComposedRules <em>Composed Rules</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getComposedRuleConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface ComposedRuleConfiguration extends InvariantRuleConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Composed Rules</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Composed Rules</em>' reference list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Composed Rules</em>' reference list.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getComposedRuleConfiguration_ComposedRules()
-	 * @model lower="2"
-	 * @generated
-	 */
-	EList<InvariantRuleConfiguration> getComposedRules();
-
-} // ComposedRuleConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantRuleConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantRuleConfiguration.java
deleted file mode 100644
index de04f47c4f2..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantRuleConfiguration.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Invariant Rule Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getInvariantRuleConfiguration()
- * @model abstract="true"
- * @generated
- */
-public interface InvariantRuleConfiguration extends EObject {
-} // InvariantRuleConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfiguration.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfiguration.java
deleted file mode 100644
index 88bf240af80..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfiguration.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Invariant Semantic Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getInvariantSemanticTypeConfiguration()
- * @model
- * @generated
- */
-public interface InvariantSemanticTypeConfiguration extends SemanticTypeConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Invariant Rule Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Invariant Rule Configuration</em>' containment reference isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Invariant Rule Configuration</em>' containment reference.
-	 * @see #setInvariantRuleConfiguration(InvariantRuleConfiguration)
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	InvariantRuleConfiguration getInvariantRuleConfiguration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Invariant Rule Configuration</em>' containment reference.
-	 * @see #getInvariantRuleConfiguration()
-	 * @generated
-	 */
-	void setInvariantRuleConfiguration(InvariantRuleConfiguration value);
-
-} // InvariantSemanticTypeConfiguration
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationFactory.java
deleted file mode 100644
index 4aa21142491..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage
- * @generated
- */
-public interface InvariantSemanticTypeConfigurationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	InvariantSemanticTypeConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Invariant Semantic Type Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Invariant Semantic Type Configuration</em>'.
-	 * @generated
-	 */
-	InvariantSemanticTypeConfiguration createInvariantSemanticTypeConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>And Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>And Rule</em>'.
-	 * @generated
-	 */
-	AndRule createAndRule();
-
-	/**
-	 * Returns a new object of class '<em>Or Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Or Rule</em>'.
-	 * @generated
-	 */
-	OrRule createOrRule();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	InvariantSemanticTypeConfigurationPackage getInvariantSemanticTypeConfigurationPackage();
-
-} // InvariantSemanticTypeConfigurationFactory
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationPackage.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationPackage.java
deleted file mode 100644
index da304fb1344..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeConfigurationPackage.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory
- * @model kind="package"
- * @generated
- */
-public interface InvariantSemanticTypeConfigurationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNAME = "invariantsemantictypeconfiguration";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_PREFIX = "invariantsemantictypeconfiguration";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	InvariantSemanticTypeConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl <em>Invariant Semantic Type Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantSemanticTypeConfiguration()
-	 * @generated
-	 */
-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__NAME = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__ICON_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Hint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__HINT = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__HINT;
-
-	/**
-	 * The feature id for the '<em><b>Kind Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__KIND_NAME = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__KIND_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
-
-	/**
-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Invariant Rule Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Invariant Semantic Type Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantRuleConfiguration()
-	 * @generated
-	 */
-	int INVARIANT_RULE_CONFIGURATION = 1;
-
-	/**
-	 * The number of structural features of the '<em>Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = 0;
-
-	/**
-	 * The number of operations of the '<em>Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl <em>Composed Rule Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getComposedRuleConfiguration()
-	 * @generated
-	 */
-	int COMPOSED_RULE_CONFIGURATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Composed Rules</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Composed Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSED_RULE_CONFIGURATION_FEATURE_COUNT = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Composed Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSED_RULE_CONFIGURATION_OPERATION_COUNT = INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl <em>And Rule</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getAndRule()
-	 * @generated
-	 */
-	int AND_RULE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Composed Rules</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int AND_RULE__COMPOSED_RULES = COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES;
-
-	/**
-	 * The number of structural features of the '<em>And Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int AND_RULE_FEATURE_COUNT = COMPOSED_RULE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of operations of the '<em>And Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int AND_RULE_OPERATION_COUNT = COMPOSED_RULE_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl <em>Or Rule</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getOrRule()
-	 * @generated
-	 */
-	int OR_RULE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Composed Rules</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int OR_RULE__COMPOSED_RULES = COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES;
-
-	/**
-	 * The number of structural features of the '<em>Or Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int OR_RULE_FEATURE_COUNT = COMPOSED_RULE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of operations of the '<em>Or Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int OR_RULE_OPERATION_COUNT = COMPOSED_RULE_CONFIGURATION_OPERATION_COUNT + 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration <em>Invariant Semantic Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Invariant Semantic Type Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration
-	 * @generated
-	 */
-	EClass getInvariantSemanticTypeConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference '<em>Invariant Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration#getInvariantRuleConfiguration()
-	 * @see #getInvariantSemanticTypeConfiguration()
-	 * @generated
-	 */
-	EReference getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Invariant Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration
-	 * @generated
-	 */
-	EClass getInvariantRuleConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration <em>Composed Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Composed Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration
-	 * @generated
-	 */
-	EClass getComposedRuleConfiguration();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration#getComposedRules <em>Composed Rules</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the reference list '<em>Composed Rules</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration#getComposedRules()
-	 * @see #getComposedRuleConfiguration()
-	 * @generated
-	 */
-	EReference getComposedRuleConfiguration_ComposedRules();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule <em>And Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>And Rule</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule
-	 * @generated
-	 */
-	EClass getAndRule();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule <em>Or Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Or Rule</em>'.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule
-	 * @generated
-	 */
-	EClass getOrRule();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	InvariantSemanticTypeConfigurationFactory getInvariantSemanticTypeConfigurationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 * <li>each class,</li>
-	 * <li>each feature of each class,</li>
-	 * <li>each operation of each class,</li>
-	 * <li>each enum,</li>
-	 * <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl <em>Invariant Semantic Type Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantSemanticTypeConfiguration()
-		 * @generated
-		 */
-		EClass INVARIANT_SEMANTIC_TYPE_CONFIGURATION = eINSTANCE.getInvariantSemanticTypeConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Invariant Rule Configuration</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getInvariantRuleConfiguration()
-		 * @generated
-		 */
-		EClass INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantRuleConfiguration();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl <em>Composed Rule Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getComposedRuleConfiguration()
-		 * @generated
-		 */
-		EClass COMPOSED_RULE_CONFIGURATION = eINSTANCE.getComposedRuleConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Composed Rules</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES = eINSTANCE.getComposedRuleConfiguration_ComposedRules();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl <em>And Rule</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.AndRuleImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getAndRule()
-		 * @generated
-		 */
-		EClass AND_RULE = eINSTANCE.getAndRule();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl <em>Or Rule</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.OrRuleImpl
-		 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationPackageImpl#getOrRule()
-		 * @generated
-		 */
-		EClass OR_RULE = eINSTANCE.getOrRule();
-
-	}
-
-} // InvariantSemanticTypeConfigurationPackage
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRule.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRule.java
deleted file mode 100644
index 9f501f85ea6..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Or Rule</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#getOrRule()
- * @model
- * @generated
- */
-public interface OrRule extends ComposedRuleConfiguration {
-} // OrRule
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/AndRuleImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/AndRuleImpl.java
deleted file mode 100644
index d3f2f6198f3..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/AndRuleImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>And Rule</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class AndRuleImpl extends ComposedRuleConfigurationImpl implements AndRule {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected AndRuleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return InvariantSemanticTypeConfigurationPackage.Literals.AND_RULE;
-	}
-
-} // AndRuleImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/ComposedRuleConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/ComposedRuleConfigurationImpl.java
deleted file mode 100644
index 9c11a9699f7..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/ComposedRuleConfigurationImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Composed Rule Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.ComposedRuleConfigurationImpl#getComposedRules <em>Composed Rules</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ComposedRuleConfigurationImpl extends InvariantRuleConfigurationImpl implements ComposedRuleConfiguration {
-	/**
-	 * The cached value of the '{@link #getComposedRules() <em>Composed Rules</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getComposedRules()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<InvariantRuleConfiguration> composedRules;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ComposedRuleConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return InvariantSemanticTypeConfigurationPackage.Literals.COMPOSED_RULE_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EList<InvariantRuleConfiguration> getComposedRules() {
-		if (composedRules == null) {
-			composedRules = new EObjectResolvingEList<InvariantRuleConfiguration>(InvariantRuleConfiguration.class, this, InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES);
-		}
-		return composedRules;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:
-			return getComposedRules();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:
-			getComposedRules().clear();
-			getComposedRules().addAll((Collection<? extends InvariantRuleConfiguration>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:
-			getComposedRules().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES:
-			return composedRules != null && !composedRules.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // ComposedRuleConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantRuleConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantRuleConfigurationImpl.java
deleted file mode 100644
index 8866c1324ec..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantRuleConfigurationImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Invariant Rule Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class InvariantRuleConfigurationImpl extends MinimalEObjectImpl.Container implements InvariantRuleConfiguration {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected InvariantRuleConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_RULE_CONFIGURATION;
-	}
-
-} // InvariantRuleConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationFactoryImpl.java
deleted file mode 100644
index a8b3b0aff91..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantSemanticTypeConfigurationFactoryImpl extends EFactoryImpl implements InvariantSemanticTypeConfigurationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static InvariantSemanticTypeConfigurationFactory init() {
-		try {
-			InvariantSemanticTypeConfigurationFactory theInvariantSemanticTypeConfigurationFactory = (InvariantSemanticTypeConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(InvariantSemanticTypeConfigurationPackage.eNS_URI);
-			if (theInvariantSemanticTypeConfigurationFactory != null) {
-				return theInvariantSemanticTypeConfigurationFactory;
-			}
-		} catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new InvariantSemanticTypeConfigurationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfigurationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION:
-			return createInvariantSemanticTypeConfiguration();
-		case InvariantSemanticTypeConfigurationPackage.AND_RULE:
-			return createAndRule();
-		case InvariantSemanticTypeConfigurationPackage.OR_RULE:
-			return createOrRule();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfiguration createInvariantSemanticTypeConfiguration() {
-		InvariantSemanticTypeConfigurationImpl invariantSemanticTypeConfiguration = new InvariantSemanticTypeConfigurationImpl();
-		return invariantSemanticTypeConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public AndRule createAndRule() {
-		AndRuleImpl andRule = new AndRuleImpl();
-		return andRule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public OrRule createOrRule() {
-		OrRuleImpl orRule = new OrRuleImpl();
-		return orRule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfigurationPackage getInvariantSemanticTypeConfigurationPackage() {
-		return (InvariantSemanticTypeConfigurationPackage) getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static InvariantSemanticTypeConfigurationPackage getPackage() {
-		return InvariantSemanticTypeConfigurationPackage.eINSTANCE;
-	}
-
-} // InvariantSemanticTypeConfigurationFactoryImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationImpl.java
deleted file mode 100644
index b77b9f51f1a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationImpl.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.infra.extendedtypes.impl.SemanticTypeConfigurationImpl;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Invariant Semantic Type Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantSemanticTypeConfigurationImpl#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InvariantSemanticTypeConfigurationImpl extends SemanticTypeConfigurationImpl implements InvariantSemanticTypeConfiguration {
-	/**
-	 * The cached value of the '{@link #getInvariantRuleConfiguration() <em>Invariant Rule Configuration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getInvariantRuleConfiguration()
-	 * @generated
-	 * @ordered
-	 */
-	protected InvariantRuleConfiguration invariantRuleConfiguration;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected InvariantSemanticTypeConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return InvariantSemanticTypeConfigurationPackage.Literals.INVARIANT_SEMANTIC_TYPE_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantRuleConfiguration getInvariantRuleConfiguration() {
-		return invariantRuleConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public NotificationChain basicSetInvariantRuleConfiguration(InvariantRuleConfiguration newInvariantRuleConfiguration, NotificationChain msgs) {
-		InvariantRuleConfiguration oldInvariantRuleConfiguration = invariantRuleConfiguration;
-		invariantRuleConfiguration = newInvariantRuleConfiguration;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, oldInvariantRuleConfiguration,
-					newInvariantRuleConfiguration);
-			if (msgs == null) {
-				msgs = notification;
-			} else {
-				msgs.add(notification);
-			}
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setInvariantRuleConfiguration(InvariantRuleConfiguration newInvariantRuleConfiguration) {
-		if (newInvariantRuleConfiguration != invariantRuleConfiguration) {
-			NotificationChain msgs = null;
-			if (invariantRuleConfiguration != null) {
-				msgs = ((InternalEObject) invariantRuleConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, null, msgs);
-			}
-			if (newInvariantRuleConfiguration != null) {
-				msgs = ((InternalEObject) newInvariantRuleConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, null, msgs);
-			}
-			msgs = basicSetInvariantRuleConfiguration(newInvariantRuleConfiguration, msgs);
-			if (msgs != null) {
-				msgs.dispatch();
-			}
-		}
-		else if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, newInvariantRuleConfiguration, newInvariantRuleConfiguration));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
-			return basicSetInvariantRuleConfiguration(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
-			return getInvariantRuleConfiguration();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
-			setInvariantRuleConfiguration((InvariantRuleConfiguration) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
-			setInvariantRuleConfiguration((InvariantRuleConfiguration) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:
-			return invariantRuleConfiguration != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} // InvariantSemanticTypeConfigurationImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationPackageImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationPackageImpl.java
deleted file mode 100644
index 0b315065e8d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/InvariantSemanticTypeConfigurationPackageImpl.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationFactory;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantSemanticTypeConfigurationPackageImpl extends EPackageImpl implements InvariantSemanticTypeConfigurationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass invariantSemanticTypeConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass invariantRuleConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass composedRuleConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass andRuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass orRuleEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private InvariantSemanticTypeConfigurationPackageImpl() {
-		super(eNS_URI, InvariantSemanticTypeConfigurationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
-	 * <p>
-	 * This method is used to initialize {@link InvariantSemanticTypeConfigurationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 *
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static InvariantSemanticTypeConfigurationPackage init() {
-		if (isInited) {
-			return (InvariantSemanticTypeConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantSemanticTypeConfigurationPackage.eNS_URI);
-		}
-
-		// Obtain or create and register package
-		InvariantSemanticTypeConfigurationPackageImpl theInvariantSemanticTypeConfigurationPackage = (InvariantSemanticTypeConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InvariantSemanticTypeConfigurationPackageImpl ? EPackage.Registry.INSTANCE
-				.get(eNS_URI) : new InvariantSemanticTypeConfigurationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ExtendedtypesPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theInvariantSemanticTypeConfigurationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theInvariantSemanticTypeConfigurationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theInvariantSemanticTypeConfigurationPackage.freeze();
-
-
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(InvariantSemanticTypeConfigurationPackage.eNS_URI, theInvariantSemanticTypeConfigurationPackage);
-		return theInvariantSemanticTypeConfigurationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getInvariantSemanticTypeConfiguration() {
-		return invariantSemanticTypeConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EReference getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration() {
-		return (EReference) invariantSemanticTypeConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getInvariantRuleConfiguration() {
-		return invariantRuleConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getComposedRuleConfiguration() {
-		return composedRuleConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EReference getComposedRuleConfiguration_ComposedRules() {
-		return (EReference) composedRuleConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getAndRule() {
-		return andRuleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getOrRule() {
-		return orRuleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfigurationFactory getInvariantSemanticTypeConfigurationFactory() {
-		return (InvariantSemanticTypeConfigurationFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package. This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) {
-			return;
-		}
-		isCreated = true;
-
-		// Create classes and their features
-		invariantSemanticTypeConfigurationEClass = createEClass(INVARIANT_SEMANTIC_TYPE_CONFIGURATION);
-		createEReference(invariantSemanticTypeConfigurationEClass, INVARIANT_SEMANTIC_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION);
-
-		invariantRuleConfigurationEClass = createEClass(INVARIANT_RULE_CONFIGURATION);
-
-		composedRuleConfigurationEClass = createEClass(COMPOSED_RULE_CONFIGURATION);
-		createEReference(composedRuleConfigurationEClass, COMPOSED_RULE_CONFIGURATION__COMPOSED_RULES);
-
-		andRuleEClass = createEClass(AND_RULE);
-
-		orRuleEClass = createEClass(OR_RULE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model. This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) {
-			return;
-		}
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		invariantSemanticTypeConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getSemanticTypeConfiguration());
-		composedRuleConfigurationEClass.getESuperTypes().add(this.getInvariantRuleConfiguration());
-		andRuleEClass.getESuperTypes().add(this.getComposedRuleConfiguration());
-		orRuleEClass.getESuperTypes().add(this.getComposedRuleConfiguration());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(invariantSemanticTypeConfigurationEClass, InvariantSemanticTypeConfiguration.class, "InvariantSemanticTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getInvariantSemanticTypeConfiguration_InvariantRuleConfiguration(), this.getInvariantRuleConfiguration(), null, "invariantRuleConfiguration", null, 1, 1, InvariantSemanticTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(invariantRuleConfigurationEClass, InvariantRuleConfiguration.class, "InvariantRuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(composedRuleConfigurationEClass, ComposedRuleConfiguration.class, "ComposedRuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getComposedRuleConfiguration_ComposedRules(), this.getInvariantRuleConfiguration(), null, "composedRules", null, 2, -1, ComposedRuleConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(andRuleEClass, AndRule.class, "AndRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(orRuleEClass, OrRule.class, "OrRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} // InvariantSemanticTypeConfigurationPackageImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/OrRuleImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/OrRuleImpl.java
deleted file mode 100644
index 725a93b9767..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/impl/OrRuleImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Or Rule</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class OrRuleImpl extends ComposedRuleConfigurationImpl implements OrRule {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected OrRuleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return InvariantSemanticTypeConfigurationPackage.Literals.OR_RULE;
-	}
-
-} // OrRuleImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationAdapterFactory.java
deleted file mode 100644
index 03bc90083f8..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage
- * @generated
- */
-public class InvariantSemanticTypeConfigurationAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static InvariantSemanticTypeConfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfigurationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = InvariantSemanticTypeConfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected InvariantSemanticTypeConfigurationSwitch<Adapter> modelSwitch =
-			new InvariantSemanticTypeConfigurationSwitch<Adapter>() {
-				@Override
-				public Adapter caseInvariantSemanticTypeConfiguration(InvariantSemanticTypeConfiguration object) {
-					return createInvariantSemanticTypeConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
-					return createInvariantRuleConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter caseComposedRuleConfiguration(ComposedRuleConfiguration object) {
-					return createComposedRuleConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter caseAndRule(AndRule object) {
-					return createAndRuleAdapter();
-				}
-
-				@Override
-				public Adapter caseOrRule(OrRule object) {
-					return createOrRuleAdapter();
-				}
-
-				@Override
-				public Adapter caseConfigurationElement(ConfigurationElement object) {
-					return createConfigurationElementAdapter();
-				}
-
-				@Override
-				public Adapter caseElementTypeConfiguration(ElementTypeConfiguration object) {
-					return createElementTypeConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter caseSemanticTypeConfiguration(SemanticTypeConfiguration object) {
-					return createSemanticTypeConfigurationAdapter();
-				}
-
-				@Override
-				public Adapter defaultCase(EObject object) {
-					return createEObjectAdapter();
-				}
-			};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param target
-	 *            the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration <em>Invariant Semantic Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration
-	 * @generated
-	 */
-	public Adapter createInvariantSemanticTypeConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration
-	 * @generated
-	 */
-	public Adapter createInvariantRuleConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration <em>Composed Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration
-	 * @generated
-	 */
-	public Adapter createComposedRuleConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule <em>And Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule
-	 * @generated
-	 */
-	public Adapter createAndRuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule <em>Or Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule
-	 * @generated
-	 */
-	public Adapter createOrRuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement
-	 * @generated
-	 */
-	public Adapter createConfigurationElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration <em>Element Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration
-	 * @generated
-	 */
-	public Adapter createElementTypeConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration <em>Semantic Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration
-	 * @generated
-	 */
-	public Adapter createSemanticTypeConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} // InvariantSemanticTypeConfigurationAdapterFactory
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceFactoryImpl.java
deleted file mode 100644
index 1da0900d319..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util.InvariantSemanticTypeConfigurationResourceImpl
- * @generated
- */
-public class InvariantSemanticTypeConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfigurationResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Resource createResource(URI uri) {
-		Resource result = new InvariantSemanticTypeConfigurationResourceImpl(uri);
-		return result;
-	}
-
-} // InvariantSemanticTypeConfigurationResourceFactoryImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceImpl.java
deleted file mode 100644
index 8164b13aae8..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationResourceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util.InvariantSemanticTypeConfigurationResourceFactoryImpl
- * @generated
- */
-public class InvariantSemanticTypeConfigurationResourceImpl extends XMLResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param uri
-	 *            the URI of the new resource.
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfigurationResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} // InvariantSemanticTypeConfigurationResourceImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationSwitch.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationSwitch.java
deleted file mode 100644
index e731c65ac5b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationSwitch.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.AndRule;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.ComposedRuleConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.OrRule;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage
- * @generated
- */
-public class InvariantSemanticTypeConfigurationSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static InvariantSemanticTypeConfigurationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfigurationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = InvariantSemanticTypeConfigurationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_SEMANTIC_TYPE_CONFIGURATION: {
-			InvariantSemanticTypeConfiguration invariantSemanticTypeConfiguration = (InvariantSemanticTypeConfiguration) theEObject;
-			T result = caseInvariantSemanticTypeConfiguration(invariantSemanticTypeConfiguration);
-			if (result == null) {
-				result = caseSemanticTypeConfiguration(invariantSemanticTypeConfiguration);
-			}
-			if (result == null) {
-				result = caseElementTypeConfiguration(invariantSemanticTypeConfiguration);
-			}
-			if (result == null) {
-				result = caseConfigurationElement(invariantSemanticTypeConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION: {
-			InvariantRuleConfiguration invariantRuleConfiguration = (InvariantRuleConfiguration) theEObject;
-			T result = caseInvariantRuleConfiguration(invariantRuleConfiguration);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case InvariantSemanticTypeConfigurationPackage.COMPOSED_RULE_CONFIGURATION: {
-			ComposedRuleConfiguration composedRuleConfiguration = (ComposedRuleConfiguration) theEObject;
-			T result = caseComposedRuleConfiguration(composedRuleConfiguration);
-			if (result == null) {
-				result = caseInvariantRuleConfiguration(composedRuleConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case InvariantSemanticTypeConfigurationPackage.AND_RULE: {
-			AndRule andRule = (AndRule) theEObject;
-			T result = caseAndRule(andRule);
-			if (result == null) {
-				result = caseComposedRuleConfiguration(andRule);
-			}
-			if (result == null) {
-				result = caseInvariantRuleConfiguration(andRule);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case InvariantSemanticTypeConfigurationPackage.OR_RULE: {
-			OrRule orRule = (OrRule) theEObject;
-			T result = caseOrRule(orRule);
-			if (result == null) {
-				result = caseComposedRuleConfiguration(orRule);
-			}
-			if (result == null) {
-				result = caseInvariantRuleConfiguration(orRule);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Semantic Type Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Invariant Semantic Type Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseInvariantSemanticTypeConfiguration(InvariantSemanticTypeConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Composed Rule Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Composed Rule Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseComposedRuleConfiguration(ComposedRuleConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>And Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>And Rule</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAndRule(AndRule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Or Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Or Rule</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOrRule(OrRule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Configuration Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Configuration Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseConfigurationElement(ConfigurationElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Element Type Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Element Type Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseElementTypeConfiguration(ElementTypeConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Type Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Semantic Type Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSemanticTypeConfiguration(SemanticTypeConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} // InvariantSemanticTypeConfigurationSwitch
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationXMLProcessor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationXMLProcessor.java
deleted file mode 100644
index 2db03ade5ca..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/util/InvariantSemanticTypeConfigurationXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantSemanticTypeConfigurationXMLProcessor extends XMLProcessor {
-
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantSemanticTypeConfigurationXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		InvariantSemanticTypeConfigurationPackage.eINSTANCE.eClass();
-	}
-
-	/**
-	 * Register for "*" and "xml" file extensions the InvariantSemanticTypeConfigurationResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new InvariantSemanticTypeConfigurationResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new InvariantSemanticTypeConfigurationResourceFactoryImpl());
-		}
-		return registrations;
-	}
-
-} // InvariantSemanticTypeConfigurationXMLProcessor
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesAdapterFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesAdapterFactory.java
deleted file mode 100644
index 4ab37cb925b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesAdapterFactory.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage
- * @generated
- */
-public class ExtendedtypesAdapterFactory extends AdapterFactoryImpl {
-
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static ExtendedtypesPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedtypesAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ExtendedtypesPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ExtendedtypesSwitch<Adapter> modelSwitch = new ExtendedtypesSwitch<Adapter>() {
-
-		@Override
-		public Adapter caseExtendedElementTypeSet(ExtendedElementTypeSet object) {
-			return createExtendedElementTypeSetAdapter();
-		}
-
-		@Override
-		public Adapter caseElementTypeConfiguration(ElementTypeConfiguration object) {
-			return createElementTypeConfigurationAdapter();
-		}
-
-		@Override
-		public Adapter caseIconEntry(IconEntry object) {
-			return createIconEntryAdapter();
-		}
-
-		@Override
-		public Adapter caseConfigurationElement(ConfigurationElement object) {
-			return createConfigurationElementAdapter();
-		}
-
-		@Override
-		public Adapter caseMatcherConfiguration(MatcherConfiguration object) {
-			return createMatcherConfigurationAdapter();
-		}
-
-		@Override
-		public Adapter caseActionConfiguration(ActionConfiguration object) {
-			return createActionConfigurationAdapter();
-		}
-
-		@Override
-		public Adapter caseViewActionConfiguration(ViewActionConfiguration object) {
-			return createViewActionConfigurationAdapter();
-		}
-
-		@Override
-		public Adapter caseSemanticActionConfiguration(SemanticActionConfiguration object) {
-			return createSemanticActionConfigurationAdapter();
-		}
-
-		@Override
-		public Adapter caseSemanticTypeConfiguration(SemanticTypeConfiguration object) {
-			return createSemanticTypeConfigurationAdapter();
-		}
-
-		@Override
-		public Adapter caseViewTypeConfiguration(ViewTypeConfiguration object) {
-			return createViewTypeConfigurationAdapter();
-		}
-
-		@Override
-		public Adapter caseElementTypeAdviceConfiguration(ElementTypeAdviceConfiguration object) {
-			return createElementTypeAdviceConfigurationAdapter();
-		}
-
-		@Override
-		public Adapter caseAspectSemanticTypeConfiguration(AspectSemanticTypeConfiguration object) {
-			return createAspectSemanticTypeConfigurationAdapter();
-		}
-
-		@Override
-		public Adapter caseAspectViewTypeConfiguration(AspectViewTypeConfiguration object) {
-			return createAspectViewTypeConfigurationAdapter();
-		}
-
-		@Override
-		public Adapter defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param target
-	 *            the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet
-	 * <em>Extended Element Type Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet
-	 * @generated
-	 */
-	public Adapter createExtendedElementTypeSetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration
-	 * <em>Element Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration
-	 * @generated
-	 */
-	public Adapter createElementTypeConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.IconEntry <em>Icon Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.IconEntry
-	 * @generated
-	 */
-	public Adapter createIconEntryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement
-	 * <em>Configuration Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement
-	 * @generated
-	 */
-	public Adapter createConfigurationElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration
-	 * <em>Matcher Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration
-	 * @generated
-	 */
-	public Adapter createMatcherConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</em>} '.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration
-	 * @generated
-	 */
-	public Adapter createActionConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration
-	 * <em>View Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration
-	 * @generated
-	 */
-	public Adapter createViewActionConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration
-	 * <em>Semantic Action Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration
-	 * @generated
-	 */
-	public Adapter createSemanticActionConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration
-	 * <em>Semantic Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration
-	 * @generated
-	 */
-	public Adapter createSemanticTypeConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration
-	 * <em>View Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration
-	 * @generated
-	 */
-	public Adapter createViewTypeConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration
-	 * <em>Element Type Advice Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration
-	 * @generated
-	 */
-	public Adapter createElementTypeAdviceConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration
-	 * <em>Aspect Semantic Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration
-	 * @generated
-	 */
-	public Adapter createAspectSemanticTypeConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration
-	 * <em>Aspect View Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration
-	 * @generated
-	 */
-	public Adapter createAspectViewTypeConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-} // ExtendedtypesAdapterFactory
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceFactoryImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceFactoryImpl.java
deleted file mode 100644
index c21bde332a4..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceFactoryImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.util.ExtendedtypesResourceImpl
- * @generated
- */
-public class ExtendedtypesResourceFactoryImpl extends ResourceFactoryImpl {
-
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedtypesResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Resource createResource(URI uri) {
-		Resource result = new ExtendedtypesResourceImpl(uri);
-		return result;
-	}
-} // ExtendedtypesResourceFactoryImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceImpl.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceImpl.java
deleted file mode 100644
index a59c18533e6..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesResourceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.util.ExtendedtypesResourceFactoryImpl
- * @generated
- */
-public class ExtendedtypesResourceImpl extends XMLResourceImpl {
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param uri
-	 *            the URI of the new resource.
-	 * @generated
-	 */
-	public ExtendedtypesResourceImpl(URI uri) {
-		super(uri);
-	}
-} // ExtendedtypesResourceImpl
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesSwitch.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesSwitch.java
deleted file mode 100644
index 8ee84a60110..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesSwitch.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.AspectSemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.AspectViewTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeAdviceConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-import org.eclipse.papyrus.infra.extendedtypes.IconEntry;
-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.SemanticTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ViewActionConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ViewTypeConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage
- * @generated
- */
-public class ExtendedtypesSwitch<T> extends Switch<T> {
-
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static ExtendedtypesPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedtypesSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ExtendedtypesPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case ExtendedtypesPackage.EXTENDED_ELEMENT_TYPE_SET: {
-			ExtendedElementTypeSet extendedElementTypeSet = (ExtendedElementTypeSet) theEObject;
-			T result = caseExtendedElementTypeSet(extendedElementTypeSet);
-			if (result == null) {
-				result = caseConfigurationElement(extendedElementTypeSet);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.ELEMENT_TYPE_CONFIGURATION: {
-			ElementTypeConfiguration elementTypeConfiguration = (ElementTypeConfiguration) theEObject;
-			T result = caseElementTypeConfiguration(elementTypeConfiguration);
-			if (result == null) {
-				result = caseConfigurationElement(elementTypeConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.ICON_ENTRY: {
-			IconEntry iconEntry = (IconEntry) theEObject;
-			T result = caseIconEntry(iconEntry);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.CONFIGURATION_ELEMENT: {
-			ConfigurationElement configurationElement = (ConfigurationElement) theEObject;
-			T result = caseConfigurationElement(configurationElement);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.MATCHER_CONFIGURATION: {
-			MatcherConfiguration matcherConfiguration = (MatcherConfiguration) theEObject;
-			T result = caseMatcherConfiguration(matcherConfiguration);
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.ACTION_CONFIGURATION: {
-			ActionConfiguration actionConfiguration = (ActionConfiguration) theEObject;
-			T result = caseActionConfiguration(actionConfiguration);
-			if (result == null) {
-				result = caseConfigurationElement(actionConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.VIEW_ACTION_CONFIGURATION: {
-			ViewActionConfiguration viewActionConfiguration = (ViewActionConfiguration) theEObject;
-			T result = caseViewActionConfiguration(viewActionConfiguration);
-			if (result == null) {
-				result = caseActionConfiguration(viewActionConfiguration);
-			}
-			if (result == null) {
-				result = caseConfigurationElement(viewActionConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION: {
-			SemanticActionConfiguration semanticActionConfiguration = (SemanticActionConfiguration) theEObject;
-			T result = caseSemanticActionConfiguration(semanticActionConfiguration);
-			if (result == null) {
-				result = caseActionConfiguration(semanticActionConfiguration);
-			}
-			if (result == null) {
-				result = caseConfigurationElement(semanticActionConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.SEMANTIC_TYPE_CONFIGURATION: {
-			SemanticTypeConfiguration semanticTypeConfiguration = (SemanticTypeConfiguration) theEObject;
-			T result = caseSemanticTypeConfiguration(semanticTypeConfiguration);
-			if (result == null) {
-				result = caseElementTypeConfiguration(semanticTypeConfiguration);
-			}
-			if (result == null) {
-				result = caseConfigurationElement(semanticTypeConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.VIEW_TYPE_CONFIGURATION: {
-			ViewTypeConfiguration viewTypeConfiguration = (ViewTypeConfiguration) theEObject;
-			T result = caseViewTypeConfiguration(viewTypeConfiguration);
-			if (result == null) {
-				result = caseElementTypeConfiguration(viewTypeConfiguration);
-			}
-			if (result == null) {
-				result = caseConfigurationElement(viewTypeConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.ELEMENT_TYPE_ADVICE_CONFIGURATION: {
-			ElementTypeAdviceConfiguration elementTypeAdviceConfiguration = (ElementTypeAdviceConfiguration) theEObject;
-			T result = caseElementTypeAdviceConfiguration(elementTypeAdviceConfiguration);
-			if (result == null) {
-				result = caseConfigurationElement(elementTypeAdviceConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.ASPECT_SEMANTIC_TYPE_CONFIGURATION: {
-			AspectSemanticTypeConfiguration aspectSemanticTypeConfiguration = (AspectSemanticTypeConfiguration) theEObject;
-			T result = caseAspectSemanticTypeConfiguration(aspectSemanticTypeConfiguration);
-			if (result == null) {
-				result = caseSemanticTypeConfiguration(aspectSemanticTypeConfiguration);
-			}
-			if (result == null) {
-				result = caseElementTypeConfiguration(aspectSemanticTypeConfiguration);
-			}
-			if (result == null) {
-				result = caseConfigurationElement(aspectSemanticTypeConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case ExtendedtypesPackage.ASPECT_VIEW_TYPE_CONFIGURATION: {
-			AspectViewTypeConfiguration aspectViewTypeConfiguration = (AspectViewTypeConfiguration) theEObject;
-			T result = caseAspectViewTypeConfiguration(aspectViewTypeConfiguration);
-			if (result == null) {
-				result = caseViewTypeConfiguration(aspectViewTypeConfiguration);
-			}
-			if (result == null) {
-				result = caseElementTypeConfiguration(aspectViewTypeConfiguration);
-			}
-			if (result == null) {
-				result = caseConfigurationElement(aspectViewTypeConfiguration);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Extended Element Type Set</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Extended Element Type Set</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseExtendedElementTypeSet(ExtendedElementTypeSet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Element Type Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Element Type Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseElementTypeConfiguration(ElementTypeConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Icon Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Icon Entry</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIconEntry(IconEntry object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Configuration Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Configuration Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseConfigurationElement(ConfigurationElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Matcher Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Matcher Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMatcherConfiguration(MatcherConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Action Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Action Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseActionConfiguration(ActionConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>View Action Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>View Action Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseViewActionConfiguration(ViewActionConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Action Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Semantic Action Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSemanticActionConfiguration(SemanticActionConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Type Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Semantic Type Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSemanticTypeConfiguration(SemanticTypeConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>View Type Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>View Type Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseViewTypeConfiguration(ViewTypeConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Element Type Advice Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Element Type Advice Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseElementTypeAdviceConfiguration(ElementTypeAdviceConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Aspect Semantic Type Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Aspect Semantic Type Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAspectSemanticTypeConfiguration(AspectSemanticTypeConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Aspect View Type Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Aspect View Type Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAspectViewTypeConfiguration(AspectViewTypeConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-} // ExtendedtypesSwitch
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesXMLProcessor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesXMLProcessor.java
deleted file mode 100644
index 6f04e5e130f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src-gen/org/eclipse/papyrus/infra/extendedtypes/util/ExtendedtypesXMLProcessor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.extendedtypes.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ExtendedtypesXMLProcessor extends XMLProcessor {
-
-	/**
-	 * Public constructor to instantiate the helper.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public ExtendedtypesXMLProcessor() {
-		super((EPackage.Registry.INSTANCE));
-		ExtendedtypesPackage.eINSTANCE.eClass();
-	}
-
-	/**
-	 * Register for "*" and "xml" file extensions the ExtendedtypesResourceFactoryImpl factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
-			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new ExtendedtypesResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new ExtendedtypesResourceFactoryImpl());
-		}
-		return registrations;
-	}
-} // ExtendedtypesXMLProcessor
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AbstractConfigurableElementTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AbstractConfigurableElementTypeFactory.java
deleted file mode 100644
index eaeb61bb7b0..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AbstractConfigurableElementTypeFactory.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.extendedtypes.types.ExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.osgi.framework.Bundle;
-
-/**
- * Factory to create element type from its {@link ElementTypeConfiguration}
- */
-public abstract class AbstractConfigurableElementTypeFactory<T extends ElementTypeConfiguration> implements IExtendedElementTypeFactory<T> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public IExtendedHintedElementType createElementType(T configuration) {
-		String id = configuration.getIdentifier();
-		// display name of the element Type (used mainly in GUIs)
-		String displayName = configuration.getName();
-		// Specialized element types
-		List<IElementType> specializedTypes = new ArrayList<IElementType>(configuration.getSpecializedTypesID().size());
-		for (String specializedTypeId : configuration.getSpecializedTypesID()) {
-			IElementType specializedType = ElementTypeRegistry.getInstance().getType(specializedTypeId);
-			specializedTypes.add(specializedType);
-		}
-		IElementType[] elementTypes = specializedTypes.toArray(new IElementType[] {});
-		// icon associated to the element Type (GUI)
-		IconEntry entry = configuration.getIconEntry();
-		URL iconURL = null;
-		if (entry != null) {
-			iconURL = getURLFromEntry(entry);
-		}
-		IExtendedHintedElementType type = new ExtendedHintedElementType(id, iconURL, displayName, elementTypes, createElementMatcher(configuration), createContainerDescriptor(configuration), createEditHelperAdvice(configuration),
-				getSemanticHint(configuration), createElementCreationValidator(configuration));
-		return type;
-	}
-
-	/**
-	 * Returns the semantic hint for the element type from the given configuration
-	 */
-	protected String getSemanticHint(T configuration) {
-		return configuration.getHint();
-	}
-
-	/**
-	 * @param configuration
-	 * @return
-	 */
-	protected abstract IEditHelperAdvice createEditHelperAdvice(T configuration);
-
-	/**
-	 * @param configuration
-	 * @return
-	 */
-	protected abstract IContainerDescriptor createContainerDescriptor(T configuration);
-
-	/**
-	 * Creates the element matcher for the given configuration
-	 *
-	 * @param configuration
-	 *            the configuration from which element matcher should be created
-	 * @return the new element matcher for the created element type
-	 */
-	protected IElementMatcher createElementMatcher(T configuration) {
-		MatcherConfiguration matcherConfiguration = configuration.getMatcherConfiguration();
-		if (matcherConfiguration == null) {
-			return null;
-		}
-		// create matcher from the configuration
-		IElementMatcher matcher = ConfigurableElementMatcherFactoryRegistry.getInstance().createElementMatcher(matcherConfiguration);
-		return matcher;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public abstract ICreationElementValidator createElementCreationValidator(T configuration);
-
-	/**
-	 * @param entry
-	 * @return
-	 */
-	protected URL getURLFromEntry(IconEntry entry) {
-		Bundle bundle = Platform.getBundle(entry.getBundleId());
-		if (bundle == null) {
-			return null;
-		}
-		URL result = bundle.getEntry(entry.getIconPath());
-		if (result == null) {
-			try {
-				result = new URL(entry.getIconPath());
-			} catch (MalformedURLException e) {
-				result = null;
-			}
-		}
-		return result;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/Activator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/Activator.java
deleted file mode 100644
index ba4815c1708..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/Activator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014, 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:
- *  Patrick Tessier (CEA LIST) - Initial API and implementation
- *  Christian W. Damus - bug 485220
- *  
- /*****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.extendedtypes"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/** Logging helper */
-	public static LogHelper log;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		log = new LogHelper(this);
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		log = null;
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectConfigurationFactoryRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectConfigurationFactoryRegistry.java
deleted file mode 100644
index c8561cccb9b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectConfigurationFactoryRegistry.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 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) - Initial API and implementation
- *  Christian W. Damus - bug 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import static org.eclipse.papyrus.infra.extendedtypes.util.InternalUtils.loadClass;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-
-/**
- * Registry that manages all possible pre/post action configurations
- */
-public class AspectConfigurationFactoryRegistry {
-
-	/** private singleton instance */
-	private static AspectConfigurationFactoryRegistry registry;
-
-	/** map configuration type to matcher descriptor */
-	protected Map<String, ConfigurableClassDescriptor> configurationTypeToClassDescriptor = null;
-
-	/**
-	 * returns the singleton instance of this registry
-	 *
-	 * @return the singleton instance of this registry
-	 */
-	public static synchronized AspectConfigurationFactoryRegistry getInstance() {
-		if (registry == null) {
-			registry = new AspectConfigurationFactoryRegistry();
-			registry.init();
-		}
-		return registry;
-	}
-
-	/**
-	 * Inits the registry.
-	 */
-	protected void init() {
-		configurationTypeToClassDescriptor = new HashMap<String, AspectConfigurationFactoryRegistry.ConfigurableClassDescriptor>();
-		// read invariant rule configuration etension point
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IAspectTypeExtensionPoint.EXTENSION_POINT_ID);
-		// for each element, parses and retrieve the model file. then loads it and returns the root element
-		for (IConfigurationElement configurationElement : elements) {
-			// contributor will always be the same, but implementation could be different.
-			String contributorName = configurationElement.getContributor().getName();
-
-			String configurationClass = configurationElement.getAttribute(IAspectTypeExtensionPoint.CONFIGURATION_CLASS);
-
-			String editHelperAdviceClassName = configurationElement.getAttribute(IAspectTypeExtensionPoint.EDIT_HELPER_ADVICE_CLASS);
-			String containerDescriptorClassName = configurationElement.getAttribute(IAspectTypeExtensionPoint.CONTAINER_DESCRIPTOR_CLASS);
-			String creationElementValidatorClassName = configurationElement.getAttribute(IAspectTypeExtensionPoint.CREATION_ELEMENT_VALIDATOR_CLASS);
-
-			ConfigurableClassDescriptor configurableClassDescriptor = new ConfigurableClassDescriptor(contributorName, editHelperAdviceClassName, contributorName, containerDescriptorClassName, contributorName, creationElementValidatorClassName);
-			configurationTypeToClassDescriptor.put(configurationClass, configurableClassDescriptor);
-		}
-
-	}
-
-	/**
-	 * @param ruleConfiguration
-	 * @return
-	 */
-	public IContainerDescriptor createContainerDescriptor(ActionConfiguration ruleConfiguration) {
-		Class<IActionContainerDescriptor<ActionConfiguration>> containerDescriptorClass = getContainerDescriptorClass(ruleConfiguration);
-		if (containerDescriptorClass == null) {
-			return null;
-		}
-		try {
-			IActionContainerDescriptor<ActionConfiguration> containerDescriptor = containerDescriptorClass.newInstance();
-			if (containerDescriptor != null) {
-				containerDescriptor.init(ruleConfiguration);
-			}
-			return containerDescriptor;
-		} catch (InstantiationException e) {
-			Activator.log.error(e);
-		} catch (IllegalAccessException e) {
-			Activator.log.error(e);
-		}
-		return null;
-	}
-
-	/**
-	 * @param actionConfiguration
-	 * @return
-	 */
-	public IEditHelperAdvice createEditHelperAdvice(ActionConfiguration actionConfiguration) {
-		Class<IActionEditHelperAdvice<ActionConfiguration>> editHelperAdviceClass = getEditHelperAdviceClass(actionConfiguration);
-		if (editHelperAdviceClass == null) {
-			Activator.log.error("impossible to find the edit helper advice implementation for configuration type : " + ((actionConfiguration != null) ? actionConfiguration.eClass().getName() : "null"), null);
-			return null;
-		}
-		try {
-			IActionEditHelperAdvice<ActionConfiguration> editHelperAdvice = editHelperAdviceClass.newInstance();
-			if (editHelperAdvice != null) {
-				editHelperAdvice.init(actionConfiguration);
-			}
-			return editHelperAdvice;
-		} catch (InstantiationException e) {
-			Activator.log.error(e);
-		} catch (IllegalAccessException e) {
-			Activator.log.error(e);
-		}
-		return null;
-	}
-
-	/**
-	 * @param ruleConfiguration
-	 * @return
-	 */
-	public ICreationElementValidator createCreationElementValidator(ActionConfiguration actionConfiguration) {
-		Class<IActionCreationElementValidator<ActionConfiguration>> creationElementValidatorClass = getCreationElementValidatorClass(actionConfiguration);
-		if (creationElementValidatorClass == null) {
-			Activator.log.error("impossible to find the Creation Element Validator for configuration type : " + ((actionConfiguration != null) ? actionConfiguration.eClass().getName() : "null"), null);
-			return null;
-		}
-		try {
-			IActionCreationElementValidator<ActionConfiguration> creationElementValidator = creationElementValidatorClass.newInstance();
-			if (creationElementValidator != null) {
-				creationElementValidator.init(actionConfiguration);
-			}
-			return creationElementValidator;
-		} catch (InstantiationException e) {
-			Activator.log.error(e);
-		} catch (IllegalAccessException e) {
-			Activator.log.error(e);
-		}
-		return null;
-	}
-
-
-	/**
-	 * @param ruleConfiguration
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	protected Class<IActionCreationElementValidator<ActionConfiguration>> getCreationElementValidatorClass(ActionConfiguration configuration) {
-		String configurationType = configuration.eClass().getInstanceClassName();
-		String className = configurationTypeToClassDescriptor.get(configurationType).getCreationElementValidatorClassName();
-		String contributorName = configurationTypeToClassDescriptor.get(configurationType).getCreationElementValidatorContributorName();
-		// look in the list of registered matcher for the right one
-		if (className == null) {
-			Activator.log.error("There should be an implementation class for the configuration " + configurationType + " from contributor " + contributorName, null);
-		} else if (contributorName != null) {
-			return (Class<IActionCreationElementValidator<ActionConfiguration>>) loadClass(className, contributorName);
-		}
-		return null;
-	}
-
-	/**
-	 * @param configurationType
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	protected Class<IActionEditHelperAdvice<ActionConfiguration>> getEditHelperAdviceClass(ActionConfiguration configuration) {
-		String configurationType = configuration.eClass().getInstanceClassName();
-		String className = configurationTypeToClassDescriptor.get(configurationType).getEditHelperAdviceClassName();
-		String contributorName = configurationTypeToClassDescriptor.get(configurationType).getEditHelperAdviceContributorName();
-
-		// look in the list of registered edit helper advices for the right one
-		return (Class<IActionEditHelperAdvice<ActionConfiguration>>) loadClass(className, contributorName);
-	}
-
-	/**
-	 * @param configurationType
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	protected Class<IActionContainerDescriptor<ActionConfiguration>> getContainerDescriptorClass(ActionConfiguration configuration) {
-		String configurationType = configuration.eClass().getInstanceClassName();
-		String className = configurationTypeToClassDescriptor.get(configurationType).getContainerDescriptorClassName();
-		String contributorName = configurationTypeToClassDescriptor.get(configurationType).getContainerDescriptorContributorName();
-
-
-		// look in the list of registered edit helper advices for the right one
-		if (className != null && contributorName != null) {
-			return (Class<IActionContainerDescriptor<ActionConfiguration>>) loadClass(className, contributorName);
-		}
-		return null;
-	}
-
-	protected static class ConfigurableClassDescriptor {
-
-		/**
-		 * @param editHelperAdviceContributorName
-		 * @param editHelperAdviceClassName
-		 * @param containerDescriptorContributorName
-		 * @param containerDescriptorClassName
-		 */
-		public ConfigurableClassDescriptor(String editHelperAdviceContributorName, String editHelperAdviceClassName, String containerDescriptorContributorName, String containerDescriptorClassName, String creationElementValidatorContributorName,
-				String creationElementValidatorClassName) {
-			this.editHelperAdviceContributorName = editHelperAdviceContributorName;
-			this.editHelperAdviceClassName = editHelperAdviceClassName;
-			this.containerDescriptorContributorName = containerDescriptorContributorName;
-			this.containerDescriptorClassName = containerDescriptorClassName;
-			this.creationElementValidatorContributorName = creationElementValidatorContributorName;
-			this.creationElementValidatorClassName = creationElementValidatorClassName;
-		}
-
-		private final String editHelperAdviceContributorName;
-
-		private final String editHelperAdviceClassName;
-
-		private final String containerDescriptorContributorName;
-
-		private final String containerDescriptorClassName;
-
-		private final String creationElementValidatorContributorName;
-
-		private final String creationElementValidatorClassName;
-
-		/**
-		 * @return
-		 */
-		public String getCreationElementValidatorContributorName() {
-			return creationElementValidatorContributorName;
-		}
-
-		/**
-		 * @return
-		 */
-		public String getCreationElementValidatorClassName() {
-			return creationElementValidatorClassName;
-		}
-
-		/**
-		 * @return the editHelperAdviceContributorName
-		 */
-		public String getEditHelperAdviceContributorName() {
-			return editHelperAdviceContributorName;
-		}
-
-
-		/**
-		 * @return the editHelperAdviceClassName
-		 */
-		public String getEditHelperAdviceClassName() {
-			return editHelperAdviceClassName;
-		}
-
-
-		/**
-		 * @return the containerDescriptorContributorName
-		 */
-		public String getContainerDescriptorContributorName() {
-			return containerDescriptorContributorName;
-		}
-
-
-		/**
-		 * @return the containerDescriptorClassName
-		 */
-		public String getContainerDescriptorClassName() {
-			return containerDescriptorClassName;
-		}
-
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java
deleted file mode 100644
index 242ea071b23..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/AspectSemanticTypeFactory.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-
-
-/**
- * Factory to create Aspect Semantic Element Types from their {@link AspectSemanticTypeConfiguration}
- */
-public class AspectSemanticTypeFactory extends AbstractConfigurableElementTypeFactory<AspectSemanticTypeConfiguration> {
-
-	/**
-	 * Default Constructor
-	 */
-	public AspectSemanticTypeFactory() {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IEditHelperAdvice createEditHelperAdvice(AspectSemanticTypeConfiguration configuration) {
-		List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
-		List<IEditHelperAdvice> actionAdvices = new ArrayList<IEditHelperAdvice>(semanticActionConfigurations.size());
-		for (SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
-			IEditHelperAdvice advice = AspectConfigurationFactoryRegistry.getInstance().createEditHelperAdvice(actionConfiguration);
-			if (advice != null) {
-				actionAdvices.add(advice);
-				// } else {
-				// Activator.log.error("Impossible to create an advice for :" + actionConfiguration, null);
-			}
-		}
-		if (actionAdvices != null && actionAdvices.size() > 0) {
-			return new ComposedEditHelperAdvice(actionAdvices);
-		}
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IContainerDescriptor createContainerDescriptor(AspectSemanticTypeConfiguration configuration) {
-		List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
-		List<IContainerDescriptor> containerDescriptors = new ArrayList<IContainerDescriptor>(semanticActionConfigurations.size());
-		for (SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
-			IContainerDescriptor containerDescriptor = AspectConfigurationFactoryRegistry.getInstance().createContainerDescriptor(actionConfiguration);
-			if (containerDescriptor != null) {
-				containerDescriptors.add(containerDescriptor);
-				// } else {
-				// Activator.log.error("Impossible to create a container descriptor for :" + actionConfiguration, null);
-			}
-		}
-		if (containerDescriptors != null && containerDescriptors.size() > 0) {
-			return new ComposedContainerDescriptor(containerDescriptors);
-		}
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICreationElementValidator createElementCreationValidator(AspectSemanticTypeConfiguration configuration) {
-		List<SemanticActionConfiguration> semanticActionConfigurations = configuration.getActionConfiguration();
-		List<ICreationElementValidator> actionValidators = new ArrayList<ICreationElementValidator>(semanticActionConfigurations.size());
-		for (SemanticActionConfiguration actionConfiguration : semanticActionConfigurations) {
-			ICreationElementValidator validator = AspectConfigurationFactoryRegistry.getInstance().createCreationElementValidator(actionConfiguration);
-			if (validator != null) {
-				actionValidators.add(validator);
-				// } else {
-				// Activator.log.error("Impossible to create a creation element validator for :" + actionConfiguration, null);
-			}
-		}
-		if (actionValidators != null && actionValidators.size() > 0) {
-			return new ComposedElementCreationValidator(actionValidators);
-		}
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IElementMatcher createElementMatcher(AspectSemanticTypeConfiguration configuration) {
-		// these element types are there only for creation => it can not be match at any time
-		return new NullElementMatcher();
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedContainerDescriptor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedContainerDescriptor.java
deleted file mode 100644
index eee67c4fedc..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedContainerDescriptor.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-
-/**
- * @author RS211865
- */
-public class ComposedContainerDescriptor implements IContainerDescriptor {
-
-	private final List<IContainerDescriptor> containerDescriptors;
-
-	/**
-	 * @param containerDescriptors
-	 */
-	public ComposedContainerDescriptor(List<IContainerDescriptor> containerDescriptors) {
-		this.containerDescriptors = containerDescriptors;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public IElementMatcher getMatcher() {
-		List<IElementMatcher> matchers = new ArrayList<IElementMatcher>();
-		// creates a composed matcher from all container descriptors
-		for (IContainerDescriptor containerDescriptor : getContainerDescriptors()) {
-			// each composed advice should approve the request
-			IElementMatcher composedMatcher = containerDescriptor.getMatcher();
-			if (composedMatcher != null) {
-				matchers.add(composedMatcher);
-			}
-		}
-		if (matchers != null && !matchers.isEmpty()) {
-			return new ComposedElementMatcher(matchers);
-		}
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public EReference[] getContainmentFeatures() {
-		// retrieve all references in the intersection of all composed container descriptors
-		List<EReference> joinReferences = null;
-		// creates a composed matcher from all container descriptors
-		for (IContainerDescriptor containerDescriptor : getContainerDescriptors()) {
-			// each composed advice should approve the request
-			EReference[] eReferencesArray = containerDescriptor.getContainmentFeatures();
-			if (eReferencesArray != null) {
-				List<EReference> eReferences = Arrays.asList(eReferencesArray);
-				// if join references has not been set yet, set the list of possible containment features
-				// if not, make the intersection of both list
-				if (joinReferences == null) {
-					joinReferences = eReferences;
-				} else {
-					List<EReference> newReferences = new ArrayList<EReference>();
-					for (EReference eReference : joinReferences) {
-						if (eReferences.contains(eReference)) {
-							newReferences.add(eReference);
-						}
-					}
-					joinReferences = newReferences;
-				}
-			}
-		}
-		if (joinReferences != null) {
-			return joinReferences.toArray(new EReference[] {});
-		}
-		return null;
-	}
-
-	/**
-	 * @return the containerDescriptors
-	 */
-	protected List<IContainerDescriptor> getContainerDescriptors() {
-		return containerDescriptors;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedEditHelperAdvice.java
deleted file mode 100644
index ae5fba0c6e6..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedEditHelperAdvice.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * Generic class for Aspect Element types
- */
-public class ComposedEditHelperAdvice extends AbstractEditHelperAdvice {
-
-	/**
-	 * List of composed advices
-	 */
-	private final List<IEditHelperAdvice> composedAdvices;
-
-	/**
-	 * Creates a composed edit helper advice from an ordered list of advices
-	 */
-	public ComposedEditHelperAdvice(List<IEditHelperAdvice> composedAdvices) {
-		this.composedAdvices = composedAdvices;
-	}
-
-	/**
-	 * Returns the list of composed advices for this edit helper advice.
-	 *
-	 * @return the list of composed advices
-	 */
-	protected List<IEditHelperAdvice> getComposedAdvices() {
-		return composedAdvices;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		for (IEditHelperAdvice advice : getComposedAdvices()) {
-			// each composed advice should approve the request
-			if (!advice.approveRequest(request)) {
-				return false;
-			}
-		}
-		return super.approveRequest(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
-		ICommand resultCommand = null;
-		for (IEditHelperAdvice advice : getComposedAdvices()) {
-			ICommand command = advice.getBeforeEditCommand(request);
-			if (command != null) {
-				if (resultCommand != null) {
-					resultCommand = resultCommand.compose(command);
-				} else {
-					resultCommand = command;
-				}
-			}
-		}
-		return resultCommand;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
-		ICommand resultCommand = null;
-		for (IEditHelperAdvice advice : getComposedAdvices()) {
-			ICommand command = advice.getAfterEditCommand(request);
-			if (command != null) {
-				if (resultCommand != null) {
-					resultCommand = resultCommand.compose(command);
-				} else {
-					resultCommand = command;
-				}
-			}
-		}
-		return resultCommand;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
-		ICommand resultCommand = null;
-		for (IEditHelperAdvice advice : getComposedAdvices()) {
-			ICommand command = advice.getBeforeEditCommand(request);
-			if (command != null) {
-				if (resultCommand != null) {
-					resultCommand = resultCommand.compose(command);
-				} else {
-					resultCommand = command;
-				}
-			}
-		}
-		return resultCommand;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
-		ICommand resultCommand = null;
-		for (IEditHelperAdvice advice : getComposedAdvices()) {
-			ICommand command = advice.getAfterEditCommand(request);
-			if (command != null) {
-				if (resultCommand != null) {
-					resultCommand = resultCommand.compose(command);
-				} else {
-					resultCommand = command;
-				}
-			}
-		}
-		return resultCommand;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeCreateRelationshipCommand(CreateRelationshipRequest request) {
-		ICommand resultCommand = null;
-		for (IEditHelperAdvice advice : getComposedAdvices()) {
-			ICommand command = advice.getBeforeEditCommand(request);
-			if (command != null) {
-				if (resultCommand != null) {
-					resultCommand = resultCommand.compose(command);
-				} else {
-					resultCommand = command;
-				}
-			}
-		}
-		return resultCommand;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getAfterCreateRelationshipCommand(CreateRelationshipRequest request) {
-		ICommand resultCommand = null;
-		for (IEditHelperAdvice advice : getComposedAdvices()) {
-			ICommand command = advice.getAfterEditCommand(request);
-			if (command != null) {
-				if (resultCommand != null) {
-					resultCommand = resultCommand.compose(command);
-				} else {
-					resultCommand = command;
-				}
-			}
-		}
-		return resultCommand;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementCreationValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementCreationValidator.java
deleted file mode 100644
index cbe283a8f64..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementCreationValidator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import java.util.List;
-
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
-
-/**
- * {@link ICreationElementValidator} composed by several validators
- */
-public class ComposedElementCreationValidator implements ICreationElementValidator {
-
-
-	private final List<ICreationElementValidator> composedValidators;
-
-	/**
-	 * Default Constructor
-	 *
-	 * @param composedValidators
-	 *            the list of composed validators
-	 */
-	public ComposedElementCreationValidator(List<ICreationElementValidator> composedValidators) {
-		this.composedValidators = composedValidators;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean canCreate(CreateElementRequest request) {
-		for (ICreationElementValidator validator : getComposedValidators()) {
-			if (!validator.canCreate(request)) {
-				return false;
-			}
-		}
-		// all validators were OK => element can be created
-		return true;
-	}
-
-	/**
-	 * Returns the list of composed validators
-	 *
-	 * @return the list of composed validators
-	 */
-	protected List<ICreationElementValidator> getComposedValidators() {
-		return composedValidators;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementMatcher.java
deleted file mode 100644
index de437cdd300..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ComposedElementMatcher.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-
-
-/**
- * @author RS211865
- */
-public class ComposedElementMatcher implements IElementMatcher {
-
-	private final List<IElementMatcher> matchers;
-
-	public ComposedElementMatcher(List<IElementMatcher> matchers) {
-		this.matchers = matchers;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean matches(EObject eObject) {
-		for (IElementMatcher matcher : getMatchers()) {
-			if (!matcher.matches(eObject)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @return the matchers
-	 */
-	protected List<IElementMatcher> getMatchers() {
-		return matchers;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ConfigurableElementMatcherFactoryRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ConfigurableElementMatcherFactoryRegistry.java
deleted file mode 100644
index 22fec1b1ebe..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ConfigurableElementMatcherFactoryRegistry.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 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) - Initial API and implementation
- *  Christian W. Damus - bug 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import static org.eclipse.papyrus.infra.extendedtypes.util.InternalUtils.loadClass;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-
-/**
- * Registry for all element matcher factories for element matcher based on {@link MatcherConfiguration}.
- */
-public class ConfigurableElementMatcherFactoryRegistry {
-
-	/** private singleton instance */
-	private static ConfigurableElementMatcherFactoryRegistry registry;
-
-	protected Map<String, IConfigurableElementMatcherFactory<MatcherConfiguration>> configurationTypeToMatcherFactory = null;
-
-	protected List<String> configurationTypeFactoryExceptions = null;
-
-	/**
-	 * returns the singleton instance of this registry
-	 *
-	 * @return the singleton instance of this registry
-	 */
-	public static synchronized ConfigurableElementMatcherFactoryRegistry getInstance() {
-		if (registry == null) {
-			registry = new ConfigurableElementMatcherFactoryRegistry();
-			registry.init();
-		}
-		return registry;
-	}
-
-	/**
-	 * Inits the registry.
-	 */
-	protected void init() {
-		configurationTypeToMatcherFactory = new HashMap<String, IConfigurableElementMatcherFactory<MatcherConfiguration>>();
-
-	}
-
-	/**
-	 * Creates the {@link IElementMatcher} specific to the given rule configuration
-	 *
-	 * @param ruleConfiguration
-	 *            the rule configuration that will configure the created matcher
-	 * @return the {@link IElementMatcher} created or <code>null</code> if none could be created
-	 */
-	public IConfigurableElementMatcher<MatcherConfiguration> createElementMatcher(MatcherConfiguration matcherConfiguration) {
-		String configurationType = matcherConfiguration.eClass().getInstanceTypeName();
-		IConfigurableElementMatcherFactory<MatcherConfiguration> factory = configurationTypeToMatcherFactory.get(configurationType);
-		// check factory is not on the exception table
-		if (factory == null && isNotInFactoryExceptionList(configurationType)) {
-			Class<IConfigurableElementMatcherFactory<MatcherConfiguration>> factoryClass = retrieveFactoryClassFromExtensionPoint(configurationType);
-			if (factoryClass != null) {
-				try {
-					factory = factoryClass.newInstance();
-				} catch (InstantiationException e) {
-					if (configurationTypeFactoryExceptions == null) {
-						configurationTypeFactoryExceptions = new ArrayList<String>();
-					}
-					configurationTypeFactoryExceptions.add(configurationType);
-				} catch (IllegalAccessException e) {
-					if (configurationTypeFactoryExceptions == null) {
-						configurationTypeFactoryExceptions = new ArrayList<String>();
-					}
-					configurationTypeFactoryExceptions.add(configurationType);
-				}
-				configurationTypeToMatcherFactory.put(configurationType, factory);
-			}
-		}
-		if (factory != null) {
-			IConfigurableElementMatcher<MatcherConfiguration> elementMatcher = factory.createElementMatcher(matcherConfiguration);
-			if (elementMatcher != null) {
-				// elementMatcher.init(matcherConfiguration);
-				return elementMatcher;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * check this configuration type has not already caused issues du
-	 *
-	 * @param configurationType
-	 * @return
-	 */
-	protected boolean isNotInFactoryExceptionList(String configurationType) {
-		if (configurationTypeFactoryExceptions == null) {
-			return true;
-		}
-		// this is not null, check the configuration type is not in the list
-		return !configurationTypeFactoryExceptions.contains(configurationType);
-	}
-
-	/**
-	 * Returns the {@link IExtendedElementTypeFactory} class used to instantiate element type for the given configuration
-	 *
-	 * @return the {@link IExtendedElementTypeFactory} found or <code>null</code> if none was found
-	 */
-	@SuppressWarnings("unchecked")
-	protected Class<IConfigurableElementMatcherFactory<MatcherConfiguration>> retrieveFactoryClassFromExtensionPoint(String configurationType) {
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IElementMatcherExtensionPoint.EXTENSION_POINT_ID);
-		for (IConfigurationElement configurationElement : elements) {
-			String eCoreClassName = configurationElement.getAttribute(IElementMatcherExtensionPoint.MATCHER_CONFIGURATION_CLASS);
-			if (configurationType.equals(eCoreClassName)) {
-				// retrieve factory to load
-				String factoryClassName = configurationElement.getAttribute(IElementMatcherExtensionPoint.MATCHER_FACTORY_CLASS);
-				return (Class<IConfigurableElementMatcherFactory<MatcherConfiguration>>) loadClass(factoryClassName, configurationElement.getContributor().getName());
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ElementTypeSetUtils.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ElementTypeSetUtils.java
deleted file mode 100644
index e143ee86007..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ElementTypeSetUtils.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-
-/**
- * Utility class to manipulate {@link ExtendedElementTypeSet}.
- */
-public class ElementTypeSetUtils {
-
-	/**
-	 * Loads
-	 *
-	 * @param extendedElementTypeSet
-	 */
-	public static void load(ExtendedElementTypeSet extendedElementTypeSet) {
-
-	}
-
-
-	// public static void unload(String identifier) {
-	// // retrieve the extended type set with given identifier and unloads it
-	// ExtendedElementTypeSet set = ExtendedElementTypeSetRegistry.getInstance().getExtendedTypeSets().get(identifier);
-	// if(set!=null) {
-	// unload(set);
-	// }
-	// }
-
-	// /**
-	// * Unloads a given {@link ExtendedElementTypeSet}
-	// * @param elementTypeSet the element type set to unload
-	// */
-	// public static void unload(ExtendedElementTypeSet elementTypeSet) {
-	// // retrieve the specializationTypeRegistry to remove all contribution from the given element type set
-	// Field declaredField = null;
-	// try {
-	// declaredField = ElementTypeRegistry.class.getDeclaredField("specializationTypeRegistry");
-	// } catch (SecurityException e1) {
-	// Activator.log.error(e1);
-	// return;
-	// } catch (NoSuchFieldException e1) {
-	// Activator.log.error(e1);
-	// return;
-	// }
-	// if(declaredField==null) {
-	// Activator.log.error("impossible to find specializationTypeRegistry", null);
-	// return;
-	// }
-	// declaredField.setAccessible(true);
-	// SpecializationTypeRegistry registry = null;
-	// try {
-	// registry = (SpecializationTypeRegistry)declaredField.get(ElementTypeRegistry.getInstance());
-	// } catch (IllegalArgumentException e) {
-	// Activator.log.error(e);
-	// } catch (IllegalAccessException e) {
-	// Activator.log.error(e);
-	// }
-	//
-	// if(registry == null) {
-	// return;
-	// }
-	//
-	// for(ElementTypeConfiguration configuration : elementTypeSet.getElementType()) {
-	// if(configuration!=null && configuration.getIdentifier()!=null) {
-	// String identifier = configuration.getIdentifier();
-	// // retrieve descriptor
-	// SpecializationTypeDescriptor descriptor = registry.getSpecializationTypeDescriptor(identifier);
-	// if(descriptor!=null) {
-	// registry.removeSpecializationType(descriptor);
-	// }
-	// }
-	// }
-	//
-	// elementTypeSet.eResource().unload();
-	// elementTypeSet.eResource().getResourceSet().getResources().remove(elementTypeSet.eResource());
-	// }
-
-	// public static void resetRegistry() {
-	// // FIXME save the current listeners, to add them back to the registry
-	// IClientContext context;
-	// try {
-	// context = TypeContext.getContext();
-	// } catch (ServiceException e1) {
-	// Activator.log.error(e1);
-	// return;
-	// }
-	// // impossibe to unregister element types...
-	// // => destroy the singleton instance of the registry...
-	// try {
-	// Field declaredField = ElementTypeRegistry.class.getDeclaredField("INSTANCE");
-	// declaredField.setAccessible(true);
-	// declaredField.set(null, null);
-	// } catch (SecurityException e1) {
-	// e1.printStackTrace();
-	// } catch (NoSuchFieldException e1) {
-	// e1.printStackTrace();
-	// } catch (IllegalArgumentException e) {
-	// e.printStackTrace();
-	// } catch (IllegalAccessException e) {
-	// e.printStackTrace();
-	// }
-	//
-	// // create the registry
-	// ElementTypeRegistry.getInstance();
-	// }
-
-}
\ No newline at end of file
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSetRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSetRegistry.java
deleted file mode 100644
index 97d1ff2f286..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSetRegistry.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 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) - Initial API and implementation
- *  Christian W. Damus - bugs 459174, 459825, 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import static org.eclipse.papyrus.infra.extendedtypes.util.InternalUtils.loadClass;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeUtil;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.IEditHelperAdviceDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.internal.impl.SpecializationTypeRegistry;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
-import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
-import org.osgi.framework.Bundle;
-
-/**
- * Registry to manage load/unloaded {@link ExtendedElementTypeSet}.
- */
-public class ExtendedElementTypeSetRegistry {
-
-	public static final String LOCAL_CONTRIBUTOR_ID = "local contribution";
-
-	/** private singleton instance */
-	private static ExtendedElementTypeSetRegistry registry;
-
-	/** Map of retrieved extended type sets, key is their identifier */
-	protected Map<String, ExtendedElementTypeSet> extendedTypeSets = null;
-
-	/** unique resource set to load all extended types models */
-	protected ResourceSet extendedTypesResourceSet = null;
-
-	protected List<ExtendedElementTypeSet> loadedExtendedElementTypeSets = null;
-
-	protected Map<String, IExtendedElementTypeFactory<ElementTypeConfiguration>> configurationTypeToElementTypeFactory = null;
-
-	protected List<String> configurationTypeFactoryExceptions = null;
-
-	/**
-	 * returns the singleton instance of this registry
-	 *
-	 * @return the singleton instance of this registry
-	 */
-	public static synchronized ExtendedElementTypeSetRegistry getInstance() {
-		if (registry == null) {
-			// Ensure the existence of element types modeled by the Element Types Configurations
-			ElementTypeSetConfigurationRegistry.getInstance();
-
-			registry = new ExtendedElementTypeSetRegistry();
-			registry.init();
-		}
-		return registry;
-	}
-
-	/**
-	 * Inits the registry.
-	 */
-	protected void init() {
-		// 0. Resets values
-		extendedTypesResourceSet = null;
-		extendedTypeSets = null;
-		configurationTypeToElementTypeFactory = new HashMap<String, IExtendedElementTypeFactory<ElementTypeConfiguration>>();
-		// 1. creates the resource set
-		extendedTypesResourceSet = createResourceSet();
-		// 2. creates the list only when registry is acceded for the first time, (or on reload?)
-		extendedTypeSets = loadExtendedTypeSets();
-	}
-
-	/**
-	 * Dispose this registry, i.e. remove all contribution on the element type registry
-	 */
-	public void dispose() {
-		if (extendedTypeSets == null) {
-			return;
-		}
-		// copy set of entries to iterate and unload them one by one
-		List<Entry<String, ExtendedElementTypeSet>> entriesToDispose = new ArrayList<Entry<String, ExtendedElementTypeSet>>(extendedTypeSets.entrySet());
-
-		for (Entry<String, ExtendedElementTypeSet> entry : entriesToDispose) {
-			unload(entry.getKey());
-		}
-		extendedTypesResourceSet = null;
-		extendedTypeSets = null;
-		configurationTypeToElementTypeFactory = new HashMap<String, IExtendedElementTypeFactory<ElementTypeConfiguration>>();
-		// 1. creates the resource set
-		extendedTypesResourceSet = null;
-		registry = null;
-	}
-
-
-	/**
-	 * Loads a given extended type set from a given identifier
-	 */
-	public void loadExtendedElementTypeSet(String identifier) {
-		if (getExtendedTypeSets() == null) {
-			return;
-		}
-
-		// retrieve the path from the identifier
-		String path = UserExtendedTypesRegistry.getInstance().getLocalExtendedTypesDefinitions().get(identifier);
-		if (path == null) {
-			return;
-		}
-
-		URI localURI = URI.createPlatformResourceURI(path, true);
-		Resource resource = extendedTypesResourceSet.createResource(localURI);
-		try {
-			resource.load(null);
-			EObject content = resource.getContents().get(0);
-			if (content instanceof ExtendedElementTypeSet) {
-				getExtendedTypeSets().put(identifier, (ExtendedElementTypeSet) content);
-				loadExtendedElementTypeSet((ExtendedElementTypeSet) content);
-			}
-		} catch (IOException e) {
-			Activator.log.error(e);
-		}
-	}
-
-	/**
-	 * Loads the specified extended element type set.
-	 * This does not take care to unload a similar set (a set with the same id) before loading. This should be handled before calling this method.
-	 *
-	 * @param extendedElementTypeSet
-	 *            {@link ExtendedElementTypeSet} to load.
-	 */
-	public void loadExtendedElementTypeSet(ExtendedElementTypeSet extendedElementTypeSet) {
-		IClientContext context;
-		try {
-			context = TypeContext.getContext();
-		} catch (ServiceException e1) {
-			Activator.log.error(e1);
-			return;
-		}
-		List<ElementTypeConfiguration> elementTypeConfigurations = extendedElementTypeSet.getElementType();
-		for (ElementTypeConfiguration configuration : elementTypeConfigurations) {
-			// load class associated to the configuration model => read extension point that defines this kind of configuration.
-			String configurationType = configuration.eClass().getInstanceTypeName();
-			// retrieve the factory for a given kind of configuration
-			IExtendedElementTypeFactory<ElementTypeConfiguration> factory = configurationTypeToElementTypeFactory.get(configurationType);
-			// check factory is not on the exception table
-			if (factory == null && isNotInFactoryExceptionList(configurationType)) {
-				Class<IExtendedElementTypeFactory<ElementTypeConfiguration>> factoryClass = retrieveFactoryClassFromExtensionPoint(configurationType);
-				if (factoryClass != null) {
-					try {
-						factory = factoryClass.newInstance();
-					} catch (InstantiationException e) {
-						if (configurationTypeFactoryExceptions == null) {
-							configurationTypeFactoryExceptions = new ArrayList<String>();
-						}
-						configurationTypeFactoryExceptions.add(configurationType);
-					} catch (IllegalAccessException e) {
-						if (configurationTypeFactoryExceptions == null) {
-							configurationTypeFactoryExceptions = new ArrayList<String>();
-						}
-						configurationTypeFactoryExceptions.add(configurationType);
-					}
-					configurationTypeToElementTypeFactory.put(configurationType, factory);
-				}
-			}
-			if (factory != null) {
-				IExtendedHintedElementType type = factory.createElementType(configuration);
-				// register element Type
-				ElementTypeRegistry.getInstance().register(type);
-				context.bindId(type.getId());
-			}
-		}
-	}
-
-	/**
-	 * Unloads a given {@link ExtendedElementTypeSet}
-	 *
-	 * @param elementTypeSet
-	 *            the element type set to unload
-	 */
-	public void unload(String identifier) {
-		if (extendedTypeSets == null) {
-			return;
-		}
-		ExtendedElementTypeSet elementTypeSet = extendedTypeSets.get(identifier);
-		if (elementTypeSet == null) {
-			// there is an entry in the map for this extended type set, it should be removed...
-			extendedTypeSets.remove(identifier);
-			return;
-		}
-
-		// Retrieve the element types to remove them from the registry
-		ElementTypeRegistry registry = ElementTypeRegistry.getInstance();
-		List<IElementType> elementTypes = new ArrayList<IElementType>(elementTypeSet.getElementType().size());
-		for (ElementTypeConfiguration configuration : elementTypeSet.getElementType()) {
-			if (configuration != null && configuration.getIdentifier() != null) {
-				String configIdentifier = configuration.getIdentifier();
-				// retrieve element type
-				IElementType elementType = registry.getType(configIdentifier);
-				if (elementType != null) {
-					elementTypes.add(elementType);
-				}
-			}
-		}
-
-		// And remove them
-		ElementTypeUtil.deregisterElementTypes(elementTypes, ElementTypeUtil.ALL_DEPENDENTS);
-
-		// Then unload the configuration model
-		Resource resource = elementTypeSet.eResource();
-		if (resource != null) {
-			resource.unload();
-			if (extendedTypesResourceSet != null) {
-				extendedTypesResourceSet.getResources().remove(resource);
-			}
-		}
-		extendedTypeSets.remove(identifier);
-	}
-
-	protected void removeAdviceFromBindings(SpecializationTypeRegistry registry, String adviceDescriptorId, IEditHelperAdviceDescriptor adviceDescriptor) {
-		ElementTypeRegistry.getInstance().deregisterAdvice(adviceDescriptor);
-	}
-
-
-
-
-	/**
-	 * check this configuration type has not already caused issues du
-	 *
-	 * @param configurationType
-	 * @return
-	 */
-	protected boolean isNotInFactoryExceptionList(String configurationType) {
-		if (configurationTypeFactoryExceptions == null) {
-			return true;
-		}
-		// this is not null, check the configuration type is not in the list
-		return !configurationTypeFactoryExceptions.contains(configurationType);
-	}
-
-	/**
-	 * Returns the {@link IExtendedElementTypeFactory} class used to instantiate element type for the given configuration
-	 *
-	 * @return the {@link IExtendedElementTypeFactory} found or <code>null</code> if none was found
-	 */
-	@SuppressWarnings("unchecked")
-	protected Class<IExtendedElementTypeFactory<ElementTypeConfiguration>> retrieveFactoryClassFromExtensionPoint(String configurationType) {
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IExtendedTypeConfigurationExtensionPoint.EXTENSION_POINT_ID);
-		for (IConfigurationElement configurationElement : elements) {
-			String eCoreClassName = configurationElement.getAttribute(IExtendedTypeConfigurationExtensionPoint.CONFIGURATION_CLASS);
-			if (configurationType.equals(eCoreClassName)) {
-				// retrieve factory to load
-				String factoryClassName = configurationElement.getAttribute(IExtendedTypeConfigurationExtensionPoint.FACTORY_CLASS);
-				return (Class<IExtendedElementTypeFactory<ElementTypeConfiguration>>) loadClass(factoryClassName, configurationElement.getContributor().getName());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Retrieves and loads extended type sets registered in the platform. It should also load configuration sets from the workspace.
-	 */
-	protected Map<String, ExtendedElementTypeSet> loadExtendedTypeSets() {
-		Map<String, ExtendedElementTypeSet> extendedElementTypeSets = new HashMap<String, ExtendedElementTypeSet>();
-		// 1. retrieve from the workspace
-		Map<String, ExtendedElementTypeSet> localSets = loadExtendedTypeSetsFromWorkspace();
-		if (localSets != null && !localSets.isEmpty()) {
-			extendedElementTypeSets.putAll(localSets);
-		}
-
-		// 2. retrieve from the platform. If already in workspace (id), do not load the platform ones
-		Map<String, ExtendedElementTypeSet> registeredSets = loadExtendedTypeSetsFromPlatform(localSets.keySet());
-		if (registeredSets != null && !registeredSets.isEmpty()) {
-			extendedElementTypeSets.putAll(registeredSets);
-		}
-		// load each extended element type set
-		for (Entry<String, ExtendedElementTypeSet> entry : extendedElementTypeSets.entrySet()) {
-			loadExtendedElementTypeSet(entry.getValue());
-		}
-		return extendedElementTypeSets;
-	}
-
-	/**
-	 * @return
-	 */
-	protected Map<String, ExtendedElementTypeSet> loadExtendedTypeSetsFromWorkspace() {
-		Map<String, String> localFilesPath = UserExtendedTypesRegistry.getInstance().getLocalExtendedTypesDefinitions();
-		Map<String, ExtendedElementTypeSet> workspaceElementTypeSets = new HashMap<String, ExtendedElementTypeSet>();
-		if (localFilesPath != null && !localFilesPath.isEmpty()) {
-			for (Entry<String, String> idToPath : localFilesPath.entrySet()) {
-				String filePath = idToPath.getValue();
-				String id = idToPath.getKey();
-
-				URI localURI = URI.createPlatformResourceURI(filePath, true);
-				Resource resource = extendedTypesResourceSet.createResource(localURI);
-				try {
-					resource.load(null);
-					EObject content = resource.getContents().get(0);
-					if (content instanceof ExtendedElementTypeSet) {
-						workspaceElementTypeSets.put(id, (ExtendedElementTypeSet) content);
-					}
-				} catch (IOException e) {
-					Activator.log.error(e);
-				}
-			}
-		}
-		return workspaceElementTypeSets;
-	}
-
-	/**
-	 * Loads the extensions in the platform
-	 *
-	 * @return the list of extension registered in the platform
-	 */
-	protected Map<String, ExtendedElementTypeSet> loadExtendedTypeSetsFromPlatform(Set<String> workspaceDefinitions) {
-		Map<String, ExtendedElementTypeSet> platformElementTypeSets = new HashMap<String, ExtendedElementTypeSet>();
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IExtendedElementTypeSetExtensionPoint.EXTENSION_POINT_ID);
-		// for each element, parses and retrieve the model file. then loads it and returns the root element
-		for (IConfigurationElement element : elements) {
-			String modelPath = element.getAttribute(IExtendedElementTypeSetExtensionPoint.PATH);
-			String extendedTypeSetId = element.getAttribute(IExtendedElementTypeSetExtensionPoint.ID);
-			String contributorID = element.getContributor().getName();
-			if (Platform.inDebugMode()) {
-				Activator.log.debug("[Reading extension point]");
-				Activator.log.debug("-  Path to the model: " + modelPath);
-				Activator.log.debug("-  id of the container bundle: " + contributorID);
-				Activator.log.debug("-  id of the extended type set: " + extendedTypeSetId);
-			}
-			ExtendedElementTypeSet set = getExtendedElementTypeSet(extendedTypeSetId, modelPath, contributorID);
-			if (set != null && !workspaceDefinitions.contains(extendedTypeSetId)) { // do not add if it is locally redefined
-				platformElementTypeSets.put(extendedTypeSetId, set);
-			}
-		}
-		return platformElementTypeSets;
-	}
-
-	/**
-	 * <p>
-	 * Loads the resource containing the extended element type set model.
-	 * </p>
-	 * <p>
-	 * It looks the model file in the fragments first, then in the plugin itself.<BR>
-	 * If this is already a fragment, it should look in the fragment only
-	 * </p>
-	 *
-	 * @param extendedTypesID
-	 *            id of the extended type set to load
-	 * @param modelPath
-	 *            path of the model in the bundle
-	 * @param bundleId
-	 *            id of the bundle containing the model file
-	 * @return the loaded file or <code>null</code> if some problem occured during loading
-	 */
-	protected ExtendedElementTypeSet getExtendedElementTypeSet(String extendedTypesID, String modelPath, String bundleId) {
-		// 1. look in preferences.
-		String filePath = UserExtendedTypesRegistry.getInstance().getExtendedTypesRedefinition(extendedTypesID);
-		if (filePath != null) {
-			getExtendedElementTypeSetInPluginStateArea(extendedTypesID);
-		}
-		// 2. no local redefinition. Load extended type set from plugin definition
-		Bundle bundle = Platform.getBundle(bundleId);
-		if (Platform.isFragment(bundle)) {
-			return getExtendedElementTypeSetInBundle(modelPath, bundleId);
-		} else { // this is a plugin. Search in sub fragments, then in the plugin
-			Bundle[] fragments = Platform.getFragments(bundle);
-			// no fragment, so the file should be in the plugin itself
-			if (fragments == null) {
-				return getExtendedElementTypeSetInBundle(modelPath, bundleId);
-			} else {
-				for (Bundle fragment : fragments) {
-					ExtendedElementTypeSet extendedElementTypeSet = getExtendedElementTypeSetInBundle(modelPath, fragment.getSymbolicName());
-					if (extendedElementTypeSet != null) {
-						return extendedElementTypeSet;
-					}
-				}
-				// not found in fragments. Look in the plugin itself
-				return getExtendedElementTypeSetInBundle(modelPath, bundleId);
-			}
-		}
-	}
-
-	/**
-	 * Retrieves the contribution in the plugin area
-	 *
-	 * @param path
-	 *            the path of the element type set to load in the plugin area
-	 */
-	protected ExtendedElementTypeSet getExtendedElementTypeSetInPluginStateArea(String path) {
-		// read in preferences area
-		IPath resourcePath = Activator.getDefault().getStateLocation().append(path);
-		URI uri = URI.createFileURI(resourcePath.toOSString());
-		if (uri != null && uri.isFile()) {
-			Resource resource = extendedTypesResourceSet.createResource(uri);
-			try {
-				resource.load(null);
-			} catch (IOException e) {
-				return null;
-			}
-			EObject content = resource.getContents().get(0);
-			if (content instanceof ExtendedElementTypeSet) {
-				return (ExtendedElementTypeSet) content;
-			}
-			Activator.log.error("Impossible to cast the object into an ExtendedElementTypeSet: " + content, null);
-			return null;
-		}
-		return null;
-	}
-
-	/**
-	 *
-	 * @param modelPath
-	 *            path of the model in the bundle
-	 * @param bundleId
-	 *            id of the bundle containing the model file
-	 * @return the loaded file or <code>null</code> if some problem occured during loading
-	 */
-	protected ExtendedElementTypeSet getExtendedElementTypeSetInBundle(String modelPath, String bundleID) {
-		Resource resource = extendedTypesResourceSet.createResource(URI.createPlatformPluginURI(bundleID + IPath.SEPARATOR + modelPath, true));
-		try {
-			resource.load(null);
-		} catch (IOException e) {
-			return null;
-		}
-		EObject content = resource.getContents().get(0);
-		if (content instanceof ExtendedElementTypeSet) {
-			return (ExtendedElementTypeSet) content;
-		}
-		Activator.log.error("Impossible to cast the object into an ExtendedElementTypeSet: " + content, null);
-		return null;
-	}
-
-	/**
-	 * Creates the resource set that contains all models for extended types
-	 *
-	 * @return the resource set newly created.
-	 */
-	protected ResourceSet createResourceSet() {
-		ResourceSet set = new ResourceSetImpl();
-		return set;
-	}
-
-	/**
-	 * @return the extendedTypeSets
-	 */
-	public Map<String, ExtendedElementTypeSet> getExtendedTypeSets() {
-		return extendedTypeSets;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypeRegistryService.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypeRegistryService.java
deleted file mode 100644
index f08da3a43fc..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypeRegistryService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.papyrus.infra.core.services.IService;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-
-
-/**
- * Service to register extended element types
- */
-public class ExtendedTypeRegistryService implements IService {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {
-
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void startService() throws ServiceException {
-		// register elements in element type registry
-		ExtendedElementTypeSetRegistry.getInstance();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void disposeService() throws ServiceException {
-		// extended element type set registry should unregister all added element types in the gmf registry
-		ExtendedElementTypeSetRegistry.getInstance().dispose();
-	}
-
-	public ExtendedElementTypeSetRegistry getExtendedElementTypeSetRegistry() {
-		return ExtendedElementTypeSetRegistry.getInstance();
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionConfigurationModelCreation.java
deleted file mode 100644
index 1364c39d18d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionConfigurationModelCreation.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-
-/**
- * Interface used to create new aspect action model element in the configuration model
- */
-public interface IActionConfigurationModelCreation<T extends ActionConfiguration> {
-
-	public T createConfigurationModel();
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionContainerDescriptor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionContainerDescriptor.java
deleted file mode 100644
index 1b71bf52bbf..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionContainerDescriptor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-
-
-/**
- * Descriptor for the configurable container descriptor
- */
-public interface IActionContainerDescriptor<T extends ActionConfiguration> extends IContainerDescriptor {
-
-	/**
-	 * Initializes the container descriptor using the given configuration
-	 *
-	 * @param actionConfiguration
-	 *            the confiugration for this container descriptor
-	 */
-	void init(T actionConfiguration);
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionCreationElementValidator.java
deleted file mode 100644
index 037a56994e7..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionCreationElementValidator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-
-/**
- * Interface implemented by all {@link ICreationElementValidator} configured by {@link ActionConfiguration}
- */
-public interface IActionCreationElementValidator<T extends ActionConfiguration> extends ICreationElementValidator {
-
-
-	/**
-	 * Initialize the validator with the given action configuration
-	 */
-	void init(T configuration);
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionEditHelperAdvice.java
deleted file mode 100644
index 7d6bd8e78b4..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IActionEditHelperAdvice.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-
-
-/**
- *
- */
-public interface IActionEditHelperAdvice<T extends ActionConfiguration> extends IEditHelperAdvice {
-
-	public void init(T configuration);
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IAspectTypeExtensionPoint.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IAspectTypeExtensionPoint.java
deleted file mode 100644
index 7c69ddaa2b3..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IAspectTypeExtensionPoint.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-
-/**
- * Constants for the extension point aspectActionConfiguration (registering models containing definition of {@link ActionConfiguration}).
- */
-public interface IAspectTypeExtensionPoint {
-
-	/** ID of the extension point */
-	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".aspectActionConfiguration";
-
-	/** attribute: name of the configuration */
-	public static final String NAME = "name";
-
-	/** attribute: icon of the configuration */
-	public static final String ICON = "icon";
-
-	/** attribute: description of the configuration */
-	public static final String DESCRIPTION = "description";
-
-	public static final String CONTAINER_DESCRIPTOR_CLASS = "semanticTypeDescriptor";
-
-	public static final String EDIT_HELPER_ADVICE_CLASS = "editHelperAdvice";
-
-	public static final String CONFIGURATION_CLASS = "configurationClass";
-
-	public static final String CONFIGURATION_MODEL_CREATION = "configurationModelCreation";
-
-	public static final String CREATION_ELEMENT_VALIDATOR_CLASS = "creationElementValidator";
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcher.java
deleted file mode 100644
index e2b02bdd02e..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcher.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-
-
-/**
- * Interface implemented by all element matchers configured by a {@link MatcherConfiguration}
- */
-public interface IConfigurableElementMatcher<T extends MatcherConfiguration> extends IElementMatcher {
-
-	/**
-	 * Inits the element matcher with the given contribution. Should be called once, after element matcher instantiation
-	 *
-	 * @param configuration
-	 *            the configuration of this {@link IElementMatcher}
-	 */
-	// public void init(T configuration);
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcherFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcherFactory.java
deleted file mode 100644
index a7e2cd495b2..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IConfigurableElementMatcherFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantElementMatcher;
-
-
-/**
- * interface for factories that instantiate {@link IInvariantElementMatcher} with their given configuration
- */
-public interface IConfigurableElementMatcherFactory<T extends MatcherConfiguration> {
-
-	/**
-	 * Creates an element matcher with the specified configuration
-	 *
-	 * @param configuration
-	 *            the configuration of the {@link IElementMatcher}
-	 * @return the created element matcher or <code>null</code> if none was created
-	 */
-	public IConfigurableElementMatcher<T> createElementMatcher(T configuration);
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ICreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ICreationElementValidator.java
deleted file mode 100644
index ffc53f9935a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ICreationElementValidator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
-
-/**
- * Validator used to check if element can be created for a given {@link CreateElementRequest}
- */
-public interface ICreationElementValidator {
-
-	/**
-	 * @param request
-	 * @return
-	 */
-	public boolean canCreate(CreateElementRequest request);
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IEditHelperAdviceConstants.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IEditHelperAdviceConstants.java
deleted file mode 100644
index 155a5189141..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IEditHelperAdviceConstants.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-
-/**
- * Constants used by Papyrus edit helper advices
- */
-public interface IEditHelperAdviceConstants {
-
-	public String NO_UI_KEY = "no_ui";
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherConfigurationModelCreation.java
deleted file mode 100644
index 0e831b6b4d1..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherConfigurationModelCreation.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-
-/**
- * Interface that all extension point for element matcher should provide
- */
-public interface IElementMatcherConfigurationModelCreation<T extends MatcherConfiguration> {
-
-	public T createConfigurationModel();
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherExtensionPoint.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherExtensionPoint.java
deleted file mode 100644
index 81a1157c10c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IElementMatcherExtensionPoint.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-
-
-/**
- * Extension point interface for {@link MatcherConfiguration} runtime implementations
- */
-public interface IElementMatcherExtensionPoint {
-
-	/** ID of the extension point */
-	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".elementMatcherConfiguration";
-
-	public static final String CONFIGURATION_NAME = "name";
-
-	public static final String MATCHER_CONFIGURATION_CLASS = "configurationClass";
-
-	public static final String MATCHER_FACTORY_CLASS = "factoryClass";
-
-	public static final String CONFIGURATION_MODEL_CREATION = "configurationModelCreation";
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeFactory.java
deleted file mode 100644
index f15147da7be..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-
-
-/**
- * Interface for all factories that will create element types from a given configuration
- */
-public interface IExtendedElementTypeFactory<T extends ElementTypeConfiguration> /* extends IElementTypeFactory */{
-
-	/**
-	 * Creates an element type for the given configuration
-	 *
-	 * @param configuration
-	 *            configuration of the element type to create
-	 * @return the newly created element type or <code>null</code> if no element type could be created
-	 */
-	IExtendedHintedElementType createElementType(T configuration);
-
-
-	/**
-	 * Creates the element creation validator which will be used to know if the element can be created or not
-	 *
-	 * @param configuration
-	 *            the configuration of the new element type
-	 * @return the element creation Validator or <code>null</code> if none could be created
-	 */
-	ICreationElementValidator createElementCreationValidator(T configuration);
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeSetExtensionPoint.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeSetExtensionPoint.java
deleted file mode 100644
index 6ab8e147751..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedElementTypeSetExtensionPoint.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-
-/**
- * Constants for the extension point ExtendedTypesSet (registering models containing definition of {@link ExtendedElementTypeSet}).
- */
-public interface IExtendedElementTypeSetExtensionPoint {
-
-	/** ID of the extension point */
-	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".extendedElementTypeSet";
-
-	/** attribute: path to the model file in the bundle */
-	public static final String PATH = "path";
-
-	/** attribute: identifier of the contribution */
-	public static final String ID = "id";
-
-	/** attribute: name of the configuration */
-	public static final String NAME = "name";
-
-	/** attribute: icon of the configuration */
-	public static final String ICON = "icon";
-
-	/** attribute: description of the configuration */
-	public static final String DESCRIPTION = "description";
-
-	/** element: element for the configuration element */
-	public static final String CONFIGURATION = "configuration";
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedTypeConfigurationExtensionPoint.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedTypeConfigurationExtensionPoint.java
deleted file mode 100644
index b129474889c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/IExtendedTypeConfigurationExtensionPoint.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-/**
- * Constants for the extension point ExtendedTypesSet (registering models containing definition of {@link ExtendedElementTypeSet}).
- */
-public interface IExtendedTypeConfigurationExtensionPoint {
-
-	/** ID of the extension point */
-	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".extendedTypeConfiguration";
-
-	/** attribute: name of the configuration */
-	public static final String NAME = "name";
-
-	/** attribute: icon of the configuration */
-	public static final String ICON = "icon";
-
-	/** attribute: description of the configuration */
-	public static final String DESCRIPTION = "description";
-
-	/** attribute factoryClass */
-	public static final String FACTORY_CLASS = "factoryClass";
-
-	/** attribute configurationClass */
-	public static final String CONFIGURATION_CLASS = "configurationClass";
-
-	/** attribute itemProvider */
-	public static final String ITEM_PROVIDER = "itemProvider";
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/UserExtendedTypesRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/UserExtendedTypesRegistry.java
deleted file mode 100644
index 649b2133248..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/UserExtendedTypesRegistry.java
+++ /dev/null
@@ -1,107 +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.infra.extendedtypes;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Predicate;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.infra.extendedtypes.internal.spi.IUserExtendedTypesProvider;
-import org.eclipse.papyrus.infra.types.core.Activator;
-
-/**
- * Registry of {@link IUserExtendedTypesProvider}s.
- */
-class UserExtendedTypesRegistry implements IUserExtendedTypesProvider {
-
-	private static final UserExtendedTypesRegistry INSTANCE = new UserExtendedTypesRegistry();
-
-	// Only should have the one in the UI bundle
-	private final List<IUserExtendedTypesProvider> providers = new ArrayList<>(1);
-
-	private UserExtendedTypesRegistry() {
-		super();
-
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID, "userExtendedTypes"); //$NON-NLS-1$
-		for (IConfigurationElement next : elements) {
-			switch (next.getName()) {
-			case "provider": //$NON-NLS-1$
-				try {
-					providers.add(createProvider(next));
-				} catch (ClassCastException e) {
-					Activator.log.error(e);
-				} catch (CoreException e) {
-					Activator.log.log(e.getStatus());
-				}
-				break;
-			}
-		}
-	}
-
-	public static UserExtendedTypesRegistry getInstance() {
-		return INSTANCE;
-	}
-
-	private IUserExtendedTypesProvider createProvider(IConfigurationElement config) throws CoreException {
-		Object result = config.createExecutableExtension("class"); //$NON-NLS-1$
-
-		if (!(result instanceof IUserExtendedTypesProvider)) {
-			throw new ClassCastException("Extension does not implement IUserExtendedTypesProvider interface in contributor " + config.getContributor().getName()); //$NON-NLS-1$
-		}
-
-		return (IUserExtendedTypesProvider) result;
-	}
-
-	@Override
-	public String getExtendedTypesRedefinition(String extendedTypesID) {
-		switch (providers.size()) {
-		case 0:
-			return null;
-		case 1:
-			return providers.get(0).getExtendedTypesRedefinition(extendedTypesID);
-		default:
-			return providers.stream()
-					.map(p -> p.getExtendedTypesRedefinition(extendedTypesID))
-					.filter(Objects::nonNull)
-					.findFirst()
-					.orElse(null);
-		}
-	}
-
-	@Override
-	public Map<String, String> getLocalExtendedTypesDefinitions() {
-		switch (providers.size()) {
-		case 0:
-			return Collections.emptyMap();
-		case 1:
-			return providers.get(0).getLocalExtendedTypesDefinitions();
-		default:
-			return providers.stream()
-					.map(IUserExtendedTypesProvider::getLocalExtendedTypesDefinitions)
-					.filter(Objects::nonNull)
-					.filter(((Predicate<? super Map<String, String>>) Map::isEmpty).negate())
-					.reduce(new HashMap<>(), (acc, elem) -> {
-						acc.putAll(elem);
-						return acc;
-					});
-		}
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/advices/ExtendedTypesOwnerAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/advices/ExtendedTypesOwnerAdvice.java
deleted file mode 100644
index 76c7c0d7dd1..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/advices/ExtendedTypesOwnerAdvice.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.advices;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-
-/**
- * Advice for potential owners of Extended Element Types. This advice will help to the pre/post validation for the creation of child element which is
- * describe by the extended type
- */
-public class ExtendedTypesOwnerAdvice extends AbstractEditHelperAdvice {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		if (request instanceof CreateElementRequest) {
-			// approve the request for this element and all super types
-			IElementType typeToCreate = ((CreateElementRequest) request).getElementType();
-			if (typeToCreate instanceof IExtendedHintedElementType) {
-				if (!approveCreationRequest(((IExtendedHintedElementType) typeToCreate), (CreateElementRequest) request)) {
-					return false;
-				}
-				// ask for extended super types
-				List<IExtendedHintedElementType> superExtendedTypes = getAllSuperExtendedTypes((IExtendedHintedElementType) typeToCreate);
-				if (superExtendedTypes == null || superExtendedTypes.size() == 0) {
-					return super.approveRequest(request);
-				} else {
-					for (IExtendedHintedElementType superType : superExtendedTypes) {
-						// only refuse if one element refuses the request
-						if (!approveCreationRequest(superType, (CreateElementRequest) request)) {
-							return false;
-						}
-					}
-				}
-			}
-		} else if (request instanceof SetRequest) {
-			// check the feature to set is a containment feature and element to move is an extended element type
-			EStructuralFeature feature = ((SetRequest) request).getFeature();
-			if (feature instanceof EReference) {
-				if (!((EReference) feature).isContainment()) {
-					return super.approveRequest(request);
-				} else {
-					// containment. Check the kind of element to edit
-					Object value = ((SetRequest) request).getValue();
-					// value = single object or list ?
-					if (value instanceof EObject) {
-						IElementType type = ElementTypeRegistry.getInstance().getElementType((EObject) value, request.getClientContext());
-						if (type instanceof IExtendedHintedElementType) {
-							return approveMoveRequest((IExtendedHintedElementType) type, (SetRequest) request);
-						}
-					} else if (value instanceof List<?>) {
-						for (Object object : (List<Object>) value) {
-							if (object instanceof EObject) {
-								IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching((EObject) object, request.getClientContext());
-								for (IElementType type : types) {
-									if (type instanceof IExtendedHintedElementType) {
-										if (!approveMoveRequest((IExtendedHintedElementType) type, (SetRequest) request)) {
-											return false;
-										}
-										List<IExtendedHintedElementType> superExtendedTypes = getAllSuperExtendedTypes((IExtendedHintedElementType) type);
-										if (superExtendedTypes == null || superExtendedTypes.size() == 0) {
-											// nothing here
-										} else {
-											for (IExtendedHintedElementType superType : superExtendedTypes) {
-												// only refuse if one element refuses the request
-												if (!approveMoveRequest(superType, (SetRequest) request)) {
-													return false;
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		} else if (request instanceof MoveRequest) {
-			// check the feature to set is a containment feature and element to move is an extended element type
-			Map<EObject, EReference> objectsToMove = ((MoveRequest) request).getElementsToMove();
-			if (objectsToMove == null || objectsToMove.isEmpty()) {
-				return super.approveRequest(request);
-			}
-			for (Entry<EObject, EReference> movedElement : objectsToMove.entrySet()) {
-				// do not compute with reference, this can be null. This could be interesting to check...
-				IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(movedElement.getKey(), request.getClientContext());
-				for (IElementType type : types) {
-					if (type instanceof IExtendedHintedElementType) {
-						if (!approveMoveRequest((IExtendedHintedElementType) type, movedElement.getKey(), (MoveRequest) request)) {
-							return false;
-						}
-						List<IExtendedHintedElementType> superExtendedTypes = getAllSuperExtendedTypes((IExtendedHintedElementType) type);
-						if (superExtendedTypes == null || superExtendedTypes.size() == 0) {
-							// nothing here
-						} else {
-							for (IExtendedHintedElementType superType : superExtendedTypes) {
-								// only refuse if one element refuses the request
-								if (!approveMoveRequest(superType, movedElement.getKey(), (MoveRequest) request)) {
-									return false;
-								}
-							}
-						}
-					}
-				}
-			}
-			return super.approveRequest(request);
-		}
-		return super.approveRequest(request);
-	}
-
-	/**
-	 * @param iExtendedHintedElementType
-	 * @param request
-	 * @return
-	 */
-	protected boolean approveCreationRequest(IExtendedHintedElementType typeToCreate, CreateElementRequest request) {
-		IContainerDescriptor containerDescriptor = typeToCreate.getEContainerDescriptor();
-		EObject newContainer = request.getContainer();
-		// check it matches the container descriptor for the element type
-		if (containerDescriptor != null && newContainer != null) {
-			if (containerDescriptor.getContainmentFeatures() != null && containerDescriptor.getContainmentFeatures().length > 0) {
-				// check containment feature
-				List<EReference> references = Arrays.asList(containerDescriptor.getContainmentFeatures());
-				if (!(references.contains(request.getContainmentFeature()))) {
-					return false;
-				}
-			}
-			IElementMatcher containerMatcher = containerDescriptor.getMatcher();
-			if (containerMatcher != null) {
-				if (!containerMatcher.matches(newContainer)) {
-					return false;
-				}
-			}
-		}
-
-		// check that the element can be created. Delegates to the created element type if it can be created or not (rather than being based on the container, as usual on GMF element type framework).
-		ICreationElementValidator creationValidator = typeToCreate.getCreationElementValidator();
-		if (creationValidator != null) {
-			return creationValidator.canCreate(request);
-		}
-
-		return true;
-	}
-
-	protected boolean approveMoveRequest(IExtendedHintedElementType typeToMove, SetRequest request) {
-		IContainerDescriptor containerDescriptor = typeToMove.getEContainerDescriptor();
-		EObject newContainer = request.getElementToEdit();
-		// check it matches the container descriptor for the element type
-		if (containerDescriptor == null || newContainer == null) {
-			return true;
-		}
-		if (containerDescriptor.getContainmentFeatures() != null && containerDescriptor.getContainmentFeatures().length > 0) {
-			// check containment feature
-			List<EReference> references = Arrays.asList(containerDescriptor.getContainmentFeatures());
-			if (!(references.contains(request.getFeature()))) {
-				return false;
-			}
-		}
-		IElementMatcher containerMatcher = containerDescriptor.getMatcher();
-		if (containerMatcher != null) {
-			return containerMatcher.matches(newContainer);
-		}
-		// check container is matching the matcher of the container descriptor for the new type
-		return true;
-	}
-
-	protected boolean approveMoveRequest(IExtendedHintedElementType typeToMove, EObject objectToMove, MoveRequest request) {
-		IContainerDescriptor containerDescriptor = typeToMove.getEContainerDescriptor();
-		EObject newContainer = request.getTargetContainer();
-		// check it matches the container descriptor for the element type
-		if (containerDescriptor == null || newContainer == null) {
-			return true;
-		}
-		if (containerDescriptor.getContainmentFeatures() != null && containerDescriptor.getContainmentFeatures().length > 0) {
-			// check containment feature
-			List<EReference> references = Arrays.asList(containerDescriptor.getContainmentFeatures());
-			if (!(references.contains(request.getTargetFeature(objectToMove)))) {
-				return false;
-			}
-		}
-		IElementMatcher containerMatcher = containerDescriptor.getMatcher();
-		if (containerMatcher != null) {
-			return containerMatcher.matches(newContainer);
-		}
-		// check container is matching the matcher of the container descriptor for the new type
-		return true;
-	}
-
-	public List<IExtendedHintedElementType> getAllSuperExtendedTypes(IExtendedHintedElementType type) {
-		IElementType[] superTypes = type.getAllSuperTypes();
-		if (superTypes.length == 0) {
-			return Collections.emptyList();
-		}
-		List<IExtendedHintedElementType> superExtendedTypes = new ArrayList<IExtendedHintedElementType>();
-		// get the reverse order (the extended element types are the closest types
-		for (int i = superTypes.length - 1; i >= 0; i--) {
-			if (superTypes[i] instanceof IExtendedHintedElementType) {
-				superExtendedTypes.add((IExtendedHintedElementType) superTypes[i]);
-			} /*
-			 * else { // optimization: once we are in the hierarchy of "standard" types, we should not go into this hierarchy
-			 * return superExtendedTypes;
-			 * }
-			 */
-		}
-		return superExtendedTypes;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/internal/spi/IUserExtendedTypesProvider.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/internal/spi/IUserExtendedTypesProvider.java
deleted file mode 100644
index ca558417d00..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/internal/spi/IUserExtendedTypesProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014, 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:
- *   CEA LIST - Initial API and implementation
- *   Christian W. Damus - bug 485220
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.extendedtypes.internal.spi;
-
-import java.util.Map;
-
-/**
- * An extension protocol for providers of user-defined extended types models.
- */
-public interface IUserExtendedTypesProvider {
-	/**
-	 * Returns the path for a given extended type local redefinition
-	 *
-	 * @param extendedTypesID
-	 *            the unique identifier of the extended type to retrieve
-	 * @return the path to the configuration of the extended types or <code>null</code> if no customization exists for this extended type
-	 *         configuration
-	 */
-	String getExtendedTypesRedefinition(String extendedTypesID);
-
-	/**
-	 * Returns all the paths in the workspace that should be an extended type set to load, with the id as a key
-	 *
-	 * @return
-	 */
-	Map<String, String> getLocalExtendedTypesDefinitions();
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationContainerDescriptor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationContainerDescriptor.java
deleted file mode 100644
index 8e85a2ca13c..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationContainerDescriptor.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2014 CEA LIST 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) - Initial API and implementation
- *  Sebastien Gabel (Esterel Technologies) - Change implementation to consider denied permissions
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration;
-
-import java.util.Arrays;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.extendedtypes.Activator;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantContainerDescriptor;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
-
-/**
- * @author RS211865
- */
-public class InvariantContainerConfigurationContainerDescriptor implements IInvariantContainerDescriptor<InvariantContainerConfiguration> {
-
-	protected EList<HierarchyPermission> permissions;
-
-	private IClientContext sharedContext;
-
-	private IElementMatcher matcher;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public IElementMatcher getMatcher() {
-		if (matcher == null) {
-			matcher = createMatcher();
-		}
-		return matcher;
-	}
-
-	/**
-	 * @return
-	 */
-	protected IElementMatcher createMatcher() {
-		return new IElementMatcher() {
-
-			public boolean matches(EObject eObject) {
-				if (eObject == null) {
-					return false;
-				}
-
-				IElementType objectMetamodelType = ElementTypeRegistry.getInstance().getElementType(eObject, sharedContext);
-
-				boolean isValid = false;
-				for (HierarchyPermission permission : permissions) { // for each permission, get the matcher and matches directly
-					boolean isPermitted = permission.isIsPermitted();
-					String childType = permission.getChildType();
-					boolean isStrict = permission.isIsStrict();
-					IElementType type = ElementTypeRegistry.getInstance().getType(childType);
-					
-					// check is the permission type is a specialization type or a metamodel type, to enhance performances
-					// if this is a metamodel type and strict, a simple equals can match or not if it is permitted or not
-					// if this is a metamodel type and not strict, we only compare the list of supertypes of the eobject type with the permission Type 
-					if (type instanceof IMetamodelType) {
-						if (isStrict) {
-							isValid = type.equals(objectMetamodelType) ? isPermitted : !isPermitted;
-						} else {
-							// this is not strict 
-							// so any super metamodeltype of permission type that matches objectMetamodelType is OK
-							isValid = Arrays.asList(objectMetamodelType.getAllSuperTypes()).contains(type) ? isPermitted : !isPermitted;
-						}
-					} else if (type instanceof ISpecializationType) {
-						IElementMatcher matcher = ((ISpecializationType) type).getMatcher();
-						if (matcher != null) {
-							boolean matchesSpecialization = matcher.matches(eObject) && objectMetamodelType.equals(((ISpecializationType) type).getMetamodelType()); // the eObject matches the speciailization type that is permitted. Should then check the
-							if (matchesSpecialization) { 
-								// test the isStrict now... It will be false if it matches one of the sub-specialization type
-								if (isStrict) {
-									ISpecializationType[] subtypes = ElementTypeRegistry.getInstance().getSpecializationsOf(childType);
-									if (subtypes != null && subtypes.length > 0) {
-										for (ISpecializationType subType : subtypes) {
-											isValid = subType.getMatcher().matches(eObject) ? isPermitted : !isPermitted; // the isStrict is not verified (one of the subtypes is matched whereas it shoud not)
-										}
-									} else { // there are no further sub specialization types. 
-										isValid = isPermitted;
-									}
-								} else {
-									// not strict
-									isValid = isPermitted;
-								}
-							} else { // eObject type does not match the permission type
-								isValid = !isPermitted;
-								
-							}
-						}
-					}
-				}
-
-				// IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(eObject, sharedContext);
-				// if (types == null || types.length == 0) {
-				// return false;
-				// }
-				//
-				// for (HierarchyPermission permission : permissions) {
-				// boolean isPermitted = permission.isIsPermitted();
-				// String childType = permission.getChildType();
-				// boolean isStrict = permission.isIsStrict();
-				// IElementType type = ElementTypeRegistry.getInstance().getType(childType);
-				// if (type != null) {
-				// if (isStrict) {
-				// isValid = types[0].equals(type) ? isPermitted : !isPermitted;
-				// } else {
-				// // not strict. The super types of typeToCreate should contain the permission type if permitted, or not contain the permission type if not permitted
-				// List<IElementType> allTypes = Arrays.asList(types);
-				// isValid = allTypes.contains(type) ? isPermitted : !isPermitted;
-				// }
-				// }
-				// }
-				return isValid;
-			}
-		};
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public EReference[] getContainmentFeatures() {
-		// TODO should implement in permissions...
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(InvariantContainerConfiguration ruleConfiguration) {
-		this.permissions = ruleConfiguration.getPermissions();
-		try {
-			sharedContext = TypeContext.getContext();
-		} catch (ServiceException e) {
-			Activator.log.error(e);
-		}
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationModelCreation.java
deleted file mode 100644
index 4d294cd94a9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerConfigurationModelCreation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration;
-
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantConfigurationModelCreation;
-
-
-/**
- * @author RS211865
- */
-public class InvariantContainerConfigurationModelCreation implements IInvariantConfigurationModelCreation<InvariantContainerConfiguration> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public InvariantContainerConfiguration createConfigurationModel() {
-		return InvariantContainerConfigurationFactory.eINSTANCE.createInvariantContainerConfiguration();
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerEditHelperAdvice.java
deleted file mode 100644
index 5dace245400..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerEditHelperAdvice.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.extendedtypes.Activator;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantEditHelperAdvice;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
-
-/**
- * Edit Helper advice configured by the {@link InvariantHierarchyConfiguration}
- */
-public class InvariantContainerEditHelperAdvice extends AbstractEditHelperAdvice implements IInvariantEditHelperAdvice<InvariantContainerConfiguration> {
-
-	protected List<HierarchyPermission> permissions;
-
-	protected IClientContext sharedContext;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		if (request instanceof SetRequest) {
-			SetRequest setRequest = ((SetRequest) request);
-			EStructuralFeature structuralFeature = setRequest.getFeature();
-			if (structuralFeature instanceof EReference) {
-				EReference reference = ((EReference) structuralFeature);
-				if (reference.isContainment() && setRequest.getValue() != null) {
-					// check new value
-					return canContain(setRequest);
-				}
-			}
-		} else if (request instanceof CreateElementRequest) {
-			CreateElementRequest createElementRequest = ((CreateElementRequest) request);
-			IElementType typeToCreate = createElementRequest.getElementType();
-			boolean approvedRequest = isValid(typeToCreate, false);
-			return approvedRequest;
-		}
-		return super.approveRequest(request);
-	}
-
-	protected boolean isValid(IElementType typeToAdd, boolean baseIsValid) {
-		boolean isValid = baseIsValid;
-		for (HierarchyPermission permission : permissions) {
-			boolean isPermitted = permission.isIsPermitted();
-			String childType = permission.getChildType();
-			boolean isStrict = permission.isIsStrict();
-			IElementType type = ElementTypeRegistry.getInstance().getType(childType);
-			if (type != null) {
-				if (isStrict) {
-					if (typeToAdd.equals(type)) {
-						if (isPermitted) {
-							isValid = true;
-						}
-					} else if (!isPermitted) {
-						isValid = false;
-					}
-				} else {
-					// not strict. The super types of typeToCreate should contain the permission type if permitted, or not contain the permission type if not permitted
-					List<IElementType> allTypes = Arrays.asList(typeToAdd.getAllSuperTypes());
-					allTypes.add(typeToAdd);
-					if (allTypes.contains(type)) {
-						if (isPermitted) {
-							isValid = true;
-						}
-					} else if (!isPermitted) {
-						isValid = false;
-					}
-				}
-			}
-		}
-		return isValid;
-	}
-
-
-	protected boolean canContain(SetRequest request) {
-		// multivalue or simple value ?
-		if (request.getValue() instanceof List<?>) {
-			List<Object> values = (List<Object>) request.getValue();
-			for (Object value : values) {
-				if (value instanceof EObject) {
-					IElementType type = ElementTypeRegistry.getInstance().getElementType((EObject) value, request.getClientContext());
-					if (type != null) {
-						if (!isValid(type, false)) {
-							return false;
-						}
-					} else {
-						return false;
-					}
-				}
-			}
-		} else {
-			if (request.getValue() instanceof EObject) {
-				IElementType type = ElementTypeRegistry.getInstance().getElementType((EObject) request.getValue(), request.getClientContext());
-				if (type != null) {
-					return isValid(type, false);
-				} else {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(InvariantContainerConfiguration configuration) {
-		try {
-			sharedContext = TypeContext.getContext();
-		} catch (ServiceException e) {
-			Activator.log.error(e);
-		}
-		permissions = configuration.getPermissions();
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java
deleted file mode 100644
index 1998d627068..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantcontainerconfiguration/InvariantContainerMatcher.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantcontainerconfiguration;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.extendedtypes.Activator;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantElementMatcher;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
-
-/**
- * Matcher of the hierarchy matcher
- */
-public class InvariantContainerMatcher implements IInvariantElementMatcher<InvariantContainerConfiguration> {
-
-	protected List<HierarchyPermission> permissions;
-	
-	protected IClientContext sharedContext;
-
-	/**
-	 *
-	 */
-	public InvariantContainerMatcher() {
-		// nothing here. Trying not to create list to avoid unnecessary created objects
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean matches(EObject eObject) {
-		EObject container = eObject.eContainer();
-
-		if (container == null) {
-			return false;
-		}
-		
-		IElementType objectMetamodelType = ElementTypeRegistry.getInstance().getElementType(container, sharedContext);
-
-		boolean isValid = false;
-		for (HierarchyPermission permission : permissions) { // for each permission, get the matcher and matches directly
-			boolean isPermitted = permission.isIsPermitted();
-			String childType = permission.getChildType();
-			boolean isStrict = permission.isIsStrict();
-			IElementType type = ElementTypeRegistry.getInstance().getType(childType);
-			
-			// check is the permission type is a specialization type or a metamodel type, to enhance performances
-			// if this is a metamodel type and strict, a simple equals can match or not if it is permitted or not
-			// if this is a metamodel type and not strict, we only compare the list of supertypes of the eobject type with the permission Type 
-			if (type instanceof IMetamodelType) {
-				if (isStrict) {
-					isValid = type.equals(objectMetamodelType) ? isPermitted : !isPermitted;
-				} else {
-					// this is not strict 
-					// so any super metamodeltype of permission type that matches objectMetamodelType is OK
-					isValid = Arrays.asList(objectMetamodelType.getAllSuperTypes()).contains(type) ? isPermitted : !isPermitted;
-				}
-			} else if (type instanceof ISpecializationType) {
-				IElementMatcher matcher = ((ISpecializationType) type).getMatcher();
-				if (matcher != null) {
-					boolean matchesSpecialization = matcher.matches(container) && objectMetamodelType.equals(((ISpecializationType) type).getMetamodelType()); // the eObject matches the speciailization type that is permitted. Should then check the
-					if (matchesSpecialization) { 
-						// test the isStrict now... It will be false if it matches one of the sub-specialization type
-						if (isStrict) {
-							ISpecializationType[] subtypes = ElementTypeRegistry.getInstance().getSpecializationsOf(childType);
-							if (subtypes != null && subtypes.length > 0) {
-								for (ISpecializationType subType : subtypes) {
-									isValid = subType.getMatcher().matches(container) ? isPermitted : !isPermitted; // the isStrict is not verified (one of the subtypes is matched whereas it shoud not)
-								}
-							} else { // there are no further sub specialization types. 
-								isValid = isPermitted;
-							}
-						} else {
-							// not strict
-							isValid = isPermitted;
-						}
-					} else { // eObject type does not match the permission type
-						isValid = !isPermitted;
-						
-					}
-				}
-			}
-		}
-		
-		return isValid;
-		
-//		
-//		
-//		// retrieve element type
-//		IElementType[] containerTypes = ElementTypeRegistry.getInstance().getAllTypesMatching(container, sharedContext);
-//		if(containerTypes != null && containerTypes.length >0) {
-//			return InvariantContainerUtils.isContainerValid(containerTypes, matches, permissions);
-//		}
-//		return false;
-	}
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(InvariantContainerConfiguration configuration) {
-		try {
-			sharedContext = TypeContext.getContext();
-		} catch (ServiceException e) {
-			Activator.log.error(e);
-		}
-		this.permissions = configuration.getPermissions();
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleCreationElementValidator.java
deleted file mode 100644
index 20d119ccd7b..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleCreationElementValidator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
-
-/**
- *
- */
-public class AndRuleCreationElementValidator implements IInvariantCreationElementValidator<AndRule> {
-
-	protected List<IInvariantCreationElementValidator<InvariantRuleConfiguration>> composedValidators;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean canCreate(CreateElementRequest request) {
-		for (IInvariantCreationElementValidator<InvariantRuleConfiguration> creationElementValidator : composedValidators) {
-			if (!creationElementValidator.canCreate(request)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(AndRule configuration) {
-		composedValidators = new ArrayList<IInvariantCreationElementValidator<InvariantRuleConfiguration>>();
-		for (InvariantRuleConfiguration composedRule : configuration.getComposedRules()) {
-			IInvariantCreationElementValidator<InvariantRuleConfiguration> creationElementValidator = RuleConfigurationFactoryRegistry.getInstance().createCreationElementValidator(composedRule);
-			if (creationElementValidator != null) {
-				composedValidators.add(creationElementValidator);
-			}
-		}
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleEditHelperAdvice.java
deleted file mode 100644
index c58c5842a5d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleEditHelperAdvice.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class AndRuleEditHelperAdvice extends AbstractEditHelperAdvice implements IInvariantEditHelperAdvice<AndRule> {
-
-	protected List<IInvariantEditHelperAdvice<InvariantRuleConfiguration>> composedEditHelperAdvices;
-
-	public AndRuleEditHelperAdvice() {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(AndRule ruleConfiguration) {
-		// configuration should be a AndRule as declared in the extension point
-		composedEditHelperAdvices = new ArrayList<IInvariantEditHelperAdvice<InvariantRuleConfiguration>>();
-		for (InvariantRuleConfiguration composedRule : ruleConfiguration.getComposedRules()) {
-			IInvariantEditHelperAdvice<InvariantRuleConfiguration> editHelperAdvice = RuleConfigurationFactoryRegistry.getInstance().createEditHelperAdvice(composedRule);
-			if (editHelperAdvice != null) {
-				composedEditHelperAdvices.add(editHelperAdvice);
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		// to approve the request, all the composed edit helper advices should approve it
-		for (IEditHelperAdvice advice : composedEditHelperAdvices) {
-			if (!advice.approveRequest(request)) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleElementMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleElementMatcher.java
deleted file mode 100644
index 233ca8c7707..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/AndRuleElementMatcher.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-
-/**
- * {@link IElementMatcher} for the {@link AndRule}
- */
-public class AndRuleElementMatcher implements IInvariantElementMatcher<AndRule> {
-
-	protected List<IElementMatcher> composedMatchers;
-
-	/**
-	 *
-	 */
-	public AndRuleElementMatcher() {
-		// Nothing here
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean matches(EObject eObject) {
-		// deactivate if list of rules is empty
-		if (composedMatchers == null || composedMatchers.isEmpty()) {
-			return false;
-		}
-		for (IElementMatcher matcher : composedMatchers) {
-			if (!matcher.matches(eObject)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(AndRule configuration) {
-		// for each children configuraton, generates the matcher class and then, the 'matches' method of this matcher will delegate to the matches of the sub rules, and will add all results together
-		// configuration should be a AndRule as declared in the extension point
-		composedMatchers = new ArrayList<IElementMatcher>();
-		for (InvariantRuleConfiguration composedRule : configuration.getComposedRules()) {
-			IElementMatcher matcher = RuleConfigurationFactoryRegistry.getInstance().createMatcher(composedRule);
-			if (matcher != null) {
-				composedMatchers.add(matcher);
-			}
-		}
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantConfigurationModelCreation.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantConfigurationModelCreation.java
deleted file mode 100644
index c089f4d28cc..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantConfigurationModelCreation.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-
-/**
- * Interface used to create new invariant rule model element in the configuration model
- */
-public interface IInvariantConfigurationModelCreation<T extends InvariantRuleConfiguration> {
-
-	public T createConfigurationModel();
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantContainerDescriptor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantContainerDescriptor.java
deleted file mode 100644
index 75da81c8f4d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantContainerDescriptor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-
-
-/**
- * Descriptor for the configurable container descriptor
- */
-public interface IInvariantContainerDescriptor<T extends InvariantRuleConfiguration> extends IContainerDescriptor {
-
-	/**
-	 * @param ruleConfiguration
-	 */
-	void init(T ruleConfiguration);
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantCreationElementValidator.java
deleted file mode 100644
index abeb9cafa6a..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantCreationElementValidator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;
-
-
-/**
- *
- */
-public interface IInvariantCreationElementValidator<T extends InvariantRuleConfiguration> extends ICreationElementValidator {
-
-	void init(T configuration);
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantEditHelperAdvice.java
deleted file mode 100644
index d50cf3ddd43..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantEditHelperAdvice.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-
-/**
- * Interface for all {@link IEditHelperAdvice} that are configured by an {@link InvariantRuleConfiguration}.
- */
-public interface IInvariantEditHelperAdvice<T extends InvariantRuleConfiguration> extends IEditHelperAdvice {
-
-	/**
-	 * Inits the edit helper advice with its given configuration
-	 *
-	 * @param ruleConfiguration
-	 *            the configuration of the edit helper advice
-	 */
-	void init(T ruleConfiguration);
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantElementMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantElementMatcher.java
deleted file mode 100644
index 361021e0d74..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantElementMatcher.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-
-
-/**
- * Interface that all {@link IElementMatcher} that can be configured at runtime using a model should implement
- */
-public interface IInvariantElementMatcher<T extends InvariantRuleConfiguration> extends IElementMatcher {
-
-	/**
-	 * Initialize the element matcher with the given configuration
-	 *
-	 * @param configuration
-	 *            the runtime configuration of the matcher
-	 */
-	void init(T configuration);
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantRuleExtensionPoint.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantRuleExtensionPoint.java
deleted file mode 100644
index 17551f2b2ae..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/IInvariantRuleExtensionPoint.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.papyrus.infra.extendedtypes.Activator;
-
-
-/**
- * @author RS211865
- */
-public interface IInvariantRuleExtensionPoint {
-
-	/** ID of the extension point */
-	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".invariantRule";
-
-	public static final String ELEMENT_MATCHER_CLASS = "elementMatcher";
-
-	public static final String CONTAINER_DESCRIPTOR_CLASS = "semanticTypeDescriptor";
-
-	public static final String EDIT_HELPER_ADVICE_CLASS = "editHelperAdvice";
-
-	public static final String RULE_CONFIGURATION_CLASS = "configurationClass";
-
-	public static final String CONFIGURATION_MODEL_CREATION = "configurationModelCreation";
-
-	public static final String CREATION_ELEMENT_VALIDATOR_CLASS = "creationElementValidator";
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantElementTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantElementTypeFactory.java
deleted file mode 100644
index 882fe8ab63f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantElementTypeFactory.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import java.util.Arrays;
-
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.extendedtypes.AbstractConfigurableElementTypeFactory;
-import org.eclipse.papyrus.infra.extendedtypes.ComposedElementMatcher;
-import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;
-
-/**
- * Factory used to create ElementType from a {@link InvariantSemanticTypeConfiguration}.
- */
-public class InvariantElementTypeFactory extends AbstractConfigurableElementTypeFactory<InvariantSemanticTypeConfiguration> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public ICreationElementValidator createElementCreationValidator(InvariantSemanticTypeConfiguration configuration) {
-		return RuleConfigurationFactoryRegistry.getInstance().createCreationElementValidator(configuration.getInvariantRuleConfiguration());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected String getSemanticHint(InvariantSemanticTypeConfiguration configuration) {
-		return configuration.getHint();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IEditHelperAdvice createEditHelperAdvice(InvariantSemanticTypeConfiguration configuration) {
-		return RuleConfigurationFactoryRegistry.getInstance().createEditHelperAdvice(configuration.getInvariantRuleConfiguration());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IContainerDescriptor createContainerDescriptor(InvariantSemanticTypeConfiguration configuration) {
-		return RuleConfigurationFactoryRegistry.getInstance().createContainerDescriptor(configuration.getInvariantRuleConfiguration());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected IElementMatcher createElementMatcher(InvariantSemanticTypeConfiguration configuration) {
-		IElementMatcher superMatcher = super.createElementMatcher(configuration);
-		if (superMatcher != null) {
-			// create a composed matcher to have the matcher described by the model configuration element type and the one for the specific invariants
-			IElementMatcher invariantMatcher = RuleConfigurationFactoryRegistry.getInstance().createMatcher(configuration.getInvariantRuleConfiguration());
-			if (invariantMatcher != null) {
-				ComposedElementMatcher composedMatcher = new ComposedElementMatcher(Arrays.asList(superMatcher, invariantMatcher));
-				return composedMatcher;
-			}
-			return superMatcher;
-		}
-		// no configured matcher. Return the invariant one
-		return RuleConfigurationFactoryRegistry.getInstance().createMatcher(configuration.getInvariantRuleConfiguration());
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeContainerDescriptor.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeContainerDescriptor.java
deleted file mode 100644
index 3d5e695d937..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeContainerDescriptor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-
-
-/**
- * @author RS211865
- */
-public class InvariantSemanticTypeContainerDescriptor implements IContainerDescriptor {
-
-	/**
-	 * @param configuration
-	 */
-	public InvariantSemanticTypeContainerDescriptor(InvariantSemanticTypeConfiguration configuration) {
-
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public IElementMatcher getMatcher() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public EReference[] getContainmentFeatures() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeEditHelperAdvice.java
deleted file mode 100644
index 401b8330c88..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/InvariantSemanticTypeEditHelperAdvice.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-
-
-/**
- * Advice based on invariants
- */
-public class InvariantSemanticTypeEditHelperAdvice extends AbstractEditHelperAdvice {
-
-	/**
-	 * @param configuration
-	 */
-	public InvariantSemanticTypeEditHelperAdvice(InvariantSemanticTypeConfiguration configuration) {
-		// TODO Auto-generated constructor stub
-	}
-
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleCreationElementValidator.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleCreationElementValidator.java
deleted file mode 100644
index 815538de96d..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleCreationElementValidator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
-
-/**
- * @author RS211865
- */
-public class OrRuleCreationElementValidator implements IInvariantCreationElementValidator<OrRule> {
-
-	protected List<IInvariantCreationElementValidator<InvariantRuleConfiguration>> composedValidators;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean canCreate(CreateElementRequest request) {
-		for (IInvariantCreationElementValidator<InvariantRuleConfiguration> creationElementValidator : composedValidators) {
-			if (creationElementValidator.canCreate(request)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(OrRule configuration) {
-		composedValidators = new ArrayList<IInvariantCreationElementValidator<InvariantRuleConfiguration>>();
-		for (InvariantRuleConfiguration composedRule : configuration.getComposedRules()) {
-			IInvariantCreationElementValidator<InvariantRuleConfiguration> creationElementValidator = RuleConfigurationFactoryRegistry.getInstance().createCreationElementValidator(composedRule);
-			if (creationElementValidator != null) {
-				composedValidators.add(creationElementValidator);
-			}
-		}
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleEditHelperAdvice.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleEditHelperAdvice.java
deleted file mode 100644
index b3bbcb1deeb..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleEditHelperAdvice.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-
-/**
- * @author RS211865
- */
-public class OrRuleEditHelperAdvice extends AbstractEditHelperAdvice implements IInvariantEditHelperAdvice<OrRule> {
-
-	protected List<IInvariantEditHelperAdvice<InvariantRuleConfiguration>> composedEditHelperAdvices;
-
-	public OrRuleEditHelperAdvice() {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(OrRule ruleConfiguration) {
-		// configuration should be a AndRule as declared in the extension point
-		composedEditHelperAdvices = new ArrayList<IInvariantEditHelperAdvice<InvariantRuleConfiguration>>();
-		for (InvariantRuleConfiguration composedRule : ruleConfiguration.getComposedRules()) {
-			IInvariantEditHelperAdvice<InvariantRuleConfiguration> editHelperAdvice = RuleConfigurationFactoryRegistry.getInstance().createEditHelperAdvice(composedRule);
-			if (editHelperAdvice != null) {
-				composedEditHelperAdvices.add(editHelperAdvice);
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		// to approve the request, all the composed edit helper advices should approve it
-		for (IEditHelperAdvice advice : composedEditHelperAdvices) {
-			if (advice.approveRequest(request)) {
-				return true;
-			}
-		}
-		// return no only if no advice approves the request. As soon as one approves, return true
-		return false;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleElementMatcher.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleElementMatcher.java
deleted file mode 100644
index dfd9aea8d50..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/OrRuleElementMatcher.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-
-/**
- * @author RS211865
- */
-public class OrRuleElementMatcher implements IInvariantElementMatcher<OrRule> {
-
-	protected List<IElementMatcher> composedMatchers;
-
-	/**
-	 *
-	 */
-	public OrRuleElementMatcher() {
-		// nothing here
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean matches(EObject eObject) {
-		// deactivate if list of rules is empty
-		if (composedMatchers == null || composedMatchers.isEmpty()) {
-			return false;
-		}
-		for (IElementMatcher matcher : composedMatchers) {
-			if (matcher.matches(eObject)) {
-				return true;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(OrRule configuration) {
-		// for each children configuraton, generates the matcher class and then, the 'matches' method of this matcher will delegate to the matches of the sub rules, and will add all results together
-		// configuration should be a AndRule as declared in the extension point
-		composedMatchers = new ArrayList<IElementMatcher>();
-		for (InvariantRuleConfiguration composedRule : configuration.getComposedRules()) {
-			IElementMatcher matcher = RuleConfigurationFactoryRegistry.getInstance().createMatcher(composedRule);
-			if (matcher != null) {
-				composedMatchers.add(matcher);
-			}
-		}
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/RuleConfigurationFactoryRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/RuleConfigurationFactoryRegistry.java
deleted file mode 100644
index 1f5c0f214f8..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/invariantsemantictypeconfiguration/RuleConfigurationFactoryRegistry.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 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) - Initial API and implementation
- *  Christian W. Damus - bug 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration;
-
-import static org.eclipse.papyrus.infra.extendedtypes.util.InternalUtils.loadClass;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.infra.extendedtypes.Activator;
-
-/**
- * Registry for all matcher factories.
- */
-public class RuleConfigurationFactoryRegistry {
-
-	/** private singleton instance */
-	private static RuleConfigurationFactoryRegistry registry;
-
-	/** map configuration type to matcher descriptor */
-	protected Map<String, ConfigurableClassDescriptor> configurationTypeToClassDescriptor = null;
-
-	/**
-	 * returns the singleton instance of this registry
-	 *
-	 * @return the singleton instance of this registry
-	 */
-	public static synchronized RuleConfigurationFactoryRegistry getInstance() {
-		if (registry == null) {
-			registry = new RuleConfigurationFactoryRegistry();
-			registry.init();
-		}
-		return registry;
-	}
-
-	/**
-	 * Inits the registry.
-	 */
-	protected void init() {
-		configurationTypeToClassDescriptor = new HashMap<String, RuleConfigurationFactoryRegistry.ConfigurableClassDescriptor>();
-		// read invariant rule configuration etension point
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IInvariantRuleExtensionPoint.EXTENSION_POINT_ID);
-		// for each element, parses and retrieve the model file. then loads it and returns the root element
-		for (IConfigurationElement configurationElement : elements) {
-			// contributor will always be the same, but implementation could be different.
-			String contributorName = configurationElement.getContributor().getName();
-
-			String configurationClass = configurationElement.getAttribute(IInvariantRuleExtensionPoint.RULE_CONFIGURATION_CLASS);
-
-			String matcherClassName = configurationElement.getAttribute(IInvariantRuleExtensionPoint.ELEMENT_MATCHER_CLASS);
-			String editHelperAdviceClassName = configurationElement.getAttribute(IInvariantRuleExtensionPoint.EDIT_HELPER_ADVICE_CLASS);
-			String containerDescriptorClassName = configurationElement.getAttribute(IInvariantRuleExtensionPoint.CONTAINER_DESCRIPTOR_CLASS);
-			String creationElementValidatorClassName = configurationElement.getAttribute(IInvariantRuleExtensionPoint.CREATION_ELEMENT_VALIDATOR_CLASS);
-
-			ConfigurableClassDescriptor configurableClassDescriptor = new ConfigurableClassDescriptor(contributorName, matcherClassName, contributorName, editHelperAdviceClassName, contributorName, containerDescriptorClassName, contributorName,
-					creationElementValidatorClassName);
-			configurationTypeToClassDescriptor.put(configurationClass, configurableClassDescriptor);
-		}
-
-	}
-
-	/**
-	 * Creates the {@link IElementMatcher} specific to the given rule configuration
-	 *
-	 * @param ruleConfiguration
-	 *            the rule configuration that will configure the created matcher
-	 * @return the {@link IElementMatcher} created or <code>null</code> if none could be created
-	 */
-	public IInvariantElementMatcher<InvariantRuleConfiguration> createMatcher(InvariantRuleConfiguration ruleConfiguration) {
-		// creates the matcher from the extension points
-		Class<IInvariantElementMatcher<InvariantRuleConfiguration>> elementMatcherClass = getMatcherClass(ruleConfiguration);
-		if (elementMatcherClass == null) {
-			return null;
-		}
-		try {
-			IInvariantElementMatcher<InvariantRuleConfiguration> matcher = elementMatcherClass.newInstance();
-			if (matcher != null) {
-				matcher.init(ruleConfiguration);
-			}
-			return matcher;
-		} catch (InstantiationException e) {
-			Activator.log.error(e);
-		} catch (IllegalAccessException e) {
-			Activator.log.error(e);
-		}
-		return null;
-	}
-
-	/**
-	 * @param ruleConfiguration
-	 * @return
-	 */
-	public IInvariantContainerDescriptor<InvariantRuleConfiguration> createContainerDescriptor(InvariantRuleConfiguration ruleConfiguration) {
-		Class<IInvariantContainerDescriptor<InvariantRuleConfiguration>> containerDescriptorClass = getContainerDescriptorClass(ruleConfiguration);
-		if (containerDescriptorClass == null) {
-			return null;
-		}
-		try {
-			IInvariantContainerDescriptor<InvariantRuleConfiguration> containerDescriptor = containerDescriptorClass.newInstance();
-			if (containerDescriptor != null) {
-				containerDescriptor.init(ruleConfiguration);
-			}
-			return containerDescriptor;
-		} catch (InstantiationException e) {
-			Activator.log.error(e);
-		} catch (IllegalAccessException e) {
-			Activator.log.error(e);
-		}
-		return null;
-	}
-
-	/**
-	 * @param ruleConfiguration
-	 * @return
-	 */
-	public IInvariantEditHelperAdvice<InvariantRuleConfiguration> createEditHelperAdvice(InvariantRuleConfiguration ruleConfiguration) {
-		Class<IInvariantEditHelperAdvice<InvariantRuleConfiguration>> editHelperAdviceClass = getEditHelperAdviceClass(ruleConfiguration);
-		if (editHelperAdviceClass == null) {
-			Activator.log.error("impossible to find the edit helper advice implementation for configuration type : " + ((ruleConfiguration != null) ? ruleConfiguration.eClass().getName() : "null"), null);
-			return null;
-		}
-		try {
-			IInvariantEditHelperAdvice<InvariantRuleConfiguration> editHelperAdvice = editHelperAdviceClass.newInstance();
-			if (editHelperAdvice != null) {
-				editHelperAdvice.init(ruleConfiguration);
-			}
-			return editHelperAdvice;
-		} catch (InstantiationException e) {
-			Activator.log.error(e);
-		} catch (IllegalAccessException e) {
-			Activator.log.error(e);
-		}
-		return null;
-	}
-
-	/**
-	 * @param ruleConfiguration
-	 * @return
-	 */
-	public IInvariantCreationElementValidator<InvariantRuleConfiguration> createCreationElementValidator(InvariantRuleConfiguration ruleConfiguration) {
-		Class<IInvariantCreationElementValidator<InvariantRuleConfiguration>> creationElementValidatorClass = getCreationElementValidatorClass(ruleConfiguration);
-		if (creationElementValidatorClass == null) {
-			// Activator.log.error("impossible to find the Creation Element Validator for configuration type : " + ((ruleConfiguration!=null) ? ruleConfiguration.eClass().getName() : "null"), null);
-			return null;
-		}
-		try {
-			IInvariantCreationElementValidator<InvariantRuleConfiguration> creationElementValidator = creationElementValidatorClass.newInstance();
-			if (creationElementValidator != null) {
-				creationElementValidator.init(ruleConfiguration);
-			}
-			return creationElementValidator;
-		} catch (InstantiationException e) {
-			Activator.log.error(e);
-		} catch (IllegalAccessException e) {
-			Activator.log.error(e);
-		}
-		return null;
-	}
-
-
-	/**
-	 * @param ruleConfiguration
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	protected Class<IInvariantCreationElementValidator<InvariantRuleConfiguration>> getCreationElementValidatorClass(InvariantRuleConfiguration configuration) {
-		String configurationType = configuration.eClass().getInstanceClassName();
-		String className = configurationTypeToClassDescriptor.get(configurationType).getCreationElementValidatorClassName();
-		String contributorName = configurationTypeToClassDescriptor.get(configurationType).getCreationElementValidatorContributorName();
-
-		// look in the list of registered matcher for the right one
-		if (className == null) {
-			// Activator.log.error("There should be an implementation class for the configuration "+configurationType+ " from contributor "+contributorName, null);
-		} else if (contributorName != null) {
-			return (Class<IInvariantCreationElementValidator<InvariantRuleConfiguration>>) loadClass(className, contributorName);
-		}
-		return null;
-	}
-
-	/**
-	 * @param configurationType
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	protected Class<IInvariantElementMatcher<InvariantRuleConfiguration>> getMatcherClass(InvariantRuleConfiguration configuration) {
-
-		String configurationType = configuration.eClass().getInstanceClassName();
-		String className = configurationTypeToClassDescriptor.get(configurationType).getElementMatcherClassName();
-		String contributorName = configurationTypeToClassDescriptor.get(configurationType).getElementMatcherContributorName();
-
-		// look in the list of registered matcher for the right one
-		if (className != null && contributorName != null) {
-			return (Class<IInvariantElementMatcher<InvariantRuleConfiguration>>) loadClass(className, contributorName);
-		}
-		return null;
-	}
-
-	/**
-	 * @param configurationType
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	protected Class<IInvariantEditHelperAdvice<InvariantRuleConfiguration>> getEditHelperAdviceClass(InvariantRuleConfiguration configuration) {
-		String configurationType = configuration.eClass().getInstanceClassName();
-		String className = configurationTypeToClassDescriptor.get(configurationType).getEditHelperAdviceClassName();
-		String contributorName = configurationTypeToClassDescriptor.get(configurationType).getEditHelperAdviceContributorName();
-
-		// look in the list of registered edit helper advices for the right one
-		return (Class<IInvariantEditHelperAdvice<InvariantRuleConfiguration>>) loadClass(className, contributorName);
-	}
-
-	/**
-	 * @param configurationType
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	protected Class<IInvariantContainerDescriptor<InvariantRuleConfiguration>> getContainerDescriptorClass(InvariantRuleConfiguration configuration) {
-		String configurationType = configuration.eClass().getInstanceClassName();
-		String className = configurationTypeToClassDescriptor.get(configurationType).getContainerDescriptorClassName();
-		String contributorName = configurationTypeToClassDescriptor.get(configurationType).getContainerDescriptorContributorName();
-
-
-		// look in the list of registered edit helper advices for the right one
-		if (className != null && contributorName != null) {
-			return (Class<IInvariantContainerDescriptor<InvariantRuleConfiguration>>) loadClass(className, contributorName);
-		}
-		return null;
-	}
-
-	protected static class ConfigurableClassDescriptor {
-
-		/**
-		 * @param elementMatcherContributorName
-		 * @param elementMatcherClassName
-		 * @param editHelperAdviceContributorName
-		 * @param editHelperAdviceClassName
-		 * @param containerDescriptorContributorName
-		 * @param containerDescriptorClassName
-		 */
-		public ConfigurableClassDescriptor(String elementMatcherContributorName, String elementMatcherClassName, String editHelperAdviceContributorName, String editHelperAdviceClassName, String containerDescriptorContributorName,
-				String containerDescriptorClassName, String creationElementValidatorContributorName, String creationElementValidatorClassName) {
-			this.elementMatcherContributorName = elementMatcherContributorName;
-			this.elementMatcherClassName = elementMatcherClassName;
-			this.editHelperAdviceContributorName = editHelperAdviceContributorName;
-			this.editHelperAdviceClassName = editHelperAdviceClassName;
-			this.containerDescriptorContributorName = containerDescriptorContributorName;
-			this.containerDescriptorClassName = containerDescriptorClassName;
-			this.creationElementValidatorContributorName = creationElementValidatorContributorName;
-			this.creationElementValidatorClassName = creationElementValidatorClassName;
-		}
-
-		private final String elementMatcherContributorName;
-
-		private final String elementMatcherClassName;
-
-		private final String editHelperAdviceContributorName;
-
-		private final String editHelperAdviceClassName;
-
-		private final String containerDescriptorContributorName;
-
-		private final String containerDescriptorClassName;
-
-		private final String creationElementValidatorContributorName;
-
-		private final String creationElementValidatorClassName;
-
-		/**
-		 * @return
-		 */
-		public String getCreationElementValidatorContributorName() {
-			return creationElementValidatorContributorName;
-		}
-
-		/**
-		 * @return
-		 */
-		public String getCreationElementValidatorClassName() {
-			return creationElementValidatorClassName;
-		}
-
-		/**
-		 * @return the elementMatcherContributorName
-		 */
-		public String getElementMatcherContributorName() {
-			return elementMatcherContributorName;
-		}
-
-
-		/**
-		 * @return the elementMatcherClassName
-		 */
-		public String getElementMatcherClassName() {
-			return elementMatcherClassName;
-		}
-
-
-		/**
-		 * @return the editHelperAdviceContributorName
-		 */
-		public String getEditHelperAdviceContributorName() {
-			return editHelperAdviceContributorName;
-		}
-
-
-		/**
-		 * @return the editHelperAdviceClassName
-		 */
-		public String getEditHelperAdviceClassName() {
-			return editHelperAdviceClassName;
-		}
-
-
-		/**
-		 * @return the containerDescriptorContributorName
-		 */
-		public String getContainerDescriptorContributorName() {
-			return containerDescriptorContributorName;
-		}
-
-
-		/**
-		 * @return the containerDescriptorClassName
-		 */
-		public String getContainerDescriptorClassName() {
-			return containerDescriptorClassName;
-		}
-
-	}
-
-	// /////////////////////////////////////////////////////////////////////////
-	// loading resource
-	// /////////////////////////////////////////////////////////////////////////
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/semantic/ISemanticTypeFactory.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/semantic/ISemanticTypeFactory.java
deleted file mode 100644
index 2502447d1f9..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/semantic/ISemanticTypeFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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:
- * 	CEA LIST - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.semantic;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * Interface that must be implemented by each factory relying on the semanticTypeFactory extension point.
- */
-public interface ISemanticTypeFactory {
-
-	/** creates the element type from the given configuration */
-	IElementType createElementType();
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/ExtendedHintedElementType.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/ExtendedHintedElementType.java
deleted file mode 100644
index 8c75f235bf1..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/ExtendedHintedElementType.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.types;
-
-import java.net.URL;
-
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;
-
-
-/**
- * @author RS211865
- */
-public class ExtendedHintedElementType extends SpecializationType implements IExtendedHintedElementType {
-
-	private String semanticHint;
-
-	protected ICreationElementValidator creationElementValidator;
-
-	/**
-	 * @param id
-	 * @param iconURL
-	 * @param displayName
-	 * @param elementTypes
-	 * @param matcher
-	 * @param descriptor
-	 * @param editHelperAdvice
-	 * @param iElementCreationValidator
-	 */
-	public ExtendedHintedElementType(String id, URL iconURL, String displayName, IElementType[] elementTypes, IElementMatcher matcher, IContainerDescriptor descriptor, IEditHelperAdvice editHelperAdvice, String semanticHint,
-			ICreationElementValidator creationElementValidator) {
-		super(id, iconURL, displayName, elementTypes, matcher, descriptor, editHelperAdvice);
-		this.semanticHint = semanticHint;
-		this.creationElementValidator = creationElementValidator;
-	}
-
-	/**
-	 * Gets the semantic hint.
-	 */
-	public String getSemanticHint() {
-		return semanticHint;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public ICreationElementValidator getCreationElementValidator() {
-		return creationElementValidator;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String toString() {
-		return "Extended Type: " + getDisplayName() + " [" + getId() + "]";
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/IExtendedHintedElementType.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/IExtendedHintedElementType.java
deleted file mode 100644
index c33df0e396f..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/types/IExtendedHintedElementType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.types;
-
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.papyrus.infra.extendedtypes.ICreationElementValidator;
-
-
-/**
- * interface implemented by all configurable element types specializations
- */
-public interface IExtendedHintedElementType extends ISpecializationType, IHintedType {
-
-	public ICreationElementValidator getCreationElementValidator();
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/ElementTypeUtils.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/ElementTypeUtils.java
deleted file mode 100644
index 0be7bad9d21..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/ElementTypeUtils.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 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
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-
-/**
- * Utility class for {@link IElementType}.
- */
-public class ElementTypeUtils {
-
-	/**
-	 * Tests if two elements types are equivalent
-	 *
-	 * @param referenceType
-	 *            the reference type for the comparison
-	 * @param typeToCompare
-	 *            the type that is compared to the reference one
-	 * @return <code>true</code> if both types are equivalent semantically
-	 */
-	public static boolean isSemanticallyEquivalent(IElementType referenceType, IElementType typeToCompare) {
-		boolean isEquivalent = true;
-		// first : easy test...
-		if (typeToCompare.equals(referenceType)) {
-			return true;
-		}
-		// 2. test the kind of element.
-		if (referenceType instanceof IMetamodelType) {
-			if (!(typeToCompare instanceof IMetamodelType)) {
-				return false;
-			} else {
-				EClass referenceEclass = ((IMetamodelType) referenceType).getEClass();
-				EClass eclassToCompare = ((IMetamodelType) typeToCompare).getEClass();
-				isEquivalent = isEquivalent && referenceEclass.equals(eclassToCompare);
-			}
-		} else {
-			if ((typeToCompare instanceof IMetamodelType)) {
-				return false;
-			}
-		}
-		// metaclasses are equivalent. check for extended types now...
-		if (referenceType instanceof IExtendedHintedElementType) {
-			if (typeToCompare instanceof IExtendedHintedElementType) {
-				isEquivalent = isEquivalent && isSemanticallyEquivalent((IExtendedHintedElementType) referenceType, (IExtendedHintedElementType) typeToCompare);
-			}
-		}
-		return isEquivalent;
-	}
-
-	/**
-	 * Tests if two elements types are equivalent (configuration)
-	 *
-	 * @param referenceType
-	 *            the reference type for the comparison
-	 * @param typeToCompare
-	 *            the type that is compared to the reference one
-	 * @return <code>true</code> if both types are equivalent semantically
-	 */
-	public static boolean isSemanticallyEquivalent(IExtendedHintedElementType referenceType, IExtendedHintedElementType typeToCompare) {
-		boolean isEquivalent = true;
-		// check all pre/post action and validation
-		// ExtendedElementTypeConfiguration referenceConfiguration = referenceType.getConfiguration();
-		// ExtendedElementTypeConfiguration configurationToCompare = typeToCompare.getConfiguration();
-		// List<QueryConfiguration> referencePrevalidation = referenceConfiguration.getPreValidation();
-		// List<QueryConfiguration> prevalidationToCompare = configurationToCompare.getPreValidation();
-		// if(referencePrevalidation != null) {
-		// isEquivalent = isEquivalent && isEquivalent(referencePrevalidation, prevalidationToCompare);
-		// } else if(prevalidationToCompare != null) {
-		// isEquivalent = false;
-		// }
-		// List<PreActionConfiguration> referencePreaction = referenceConfiguration.getPreAction();
-		// List<PreActionConfiguration> preactionToCompare = configurationToCompare.getPreAction();
-		// if(referencePreaction != null) {
-		// isEquivalent = isEquivalent && isEquivalent(referencePreaction, preactionToCompare);
-		// } else if(preactionToCompare != null) {
-		// isEquivalent = false;
-		// }
-		// List<PostActionConfiguration> referencePostaction = referenceConfiguration.getPostAction();
-		// List<PostActionConfiguration> postactionToCompare = configurationToCompare.getPostAction();
-		// if(referencePostaction != null) {
-		// isEquivalent = isEquivalent && isEquivalent(referencePostaction, postactionToCompare);
-		// } else if(postactionToCompare != null) {
-		// isEquivalent = false;
-		// }
-		return isEquivalent;
-	}
-
-	public static boolean isEquivalent(List<? extends EObject> referenceList, List<? extends EObject> listToCompare) {
-		boolean isEquivalent = true;
-		if (referenceList == null) {
-			// only one is null : false
-			if (listToCompare != null) {
-				return false;
-			} else {
-				// both are null: true
-				return true;
-			}
-		} else {
-			// only one is null: false
-			if (listToCompare == null) {
-				return false;
-			}
-		}
-		// check emptyness. If both empty : equivalent
-		if (referenceList.isEmpty() && listToCompare.isEmpty()) {
-			return true;
-		}
-		// check size. If different, false
-		if (referenceList.size() != listToCompare.size()) {
-			return false;
-		}
-		for (int i = 0; i < referenceList.size(); i++) {
-			EObject reference = referenceList.get(i);
-			EObject compared = listToCompare.get(i);
-			isEquivalent = isEquivalent && EcoreUtil.equals(reference, compared);
-		}
-		return isEquivalent;
-	}
-
-	/**
-	 * Returns the closest non Extended element type for a given extended type
-	 *
-	 * @param requestElementType
-	 *            the element type to study
-	 * @return the closest non extended element type or <code>null</code> if none was found.
-	 */
-	public static IElementType findClosestNonExtendedElementType(IExtendedHintedElementType requestElementType) {
-		List<IElementType> superTypes = new ArrayList<IElementType>(Arrays.asList(requestElementType.getAllSuperTypes()));
-		// reverse order for the list, because super type returns all super types from furthest to closest, we want the other order
-		Collections.reverse(superTypes);
-		for (IElementType superType : superTypes) {
-			if (!(superType instanceof IExtendedHintedElementType)) {
-				return superType;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the closest super type which is not an extended type
-	 *
-	 * @param elementType
-	 *            the element type for which the super type is searched.
-	 * @return the closest super type non extended or <code>null</code> if none was found
-	 */
-	public static IElementType getClosestDiagramType(IElementType elementType) {
-		if (!(elementType instanceof IExtendedHintedElementType)) {
-			return elementType;
-		}
-		// // this is an extended type
-		// String diagramElementTypeID = ((IExtendedHintedElementType)elementType).getSpecializedTypeIds();
-		// if(diagramElementTypeID != null) {
-		// return getClosestDiagramType(ElementTypeRegistry.getInstance().getType(diagramElementTypeID));
-		// } else {
-		// IElementType[] superTypes = elementType.getAllSuperTypes();
-		// if(superTypes.length > 1) {
-		// return getClosestDiagramType(superTypes[superTypes.length - 1]);
-		// }
-		// }
-		return null;
-	}
-}
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/InternalUtils.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/InternalUtils.java
deleted file mode 100644
index 87978b1f448..00000000000
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/util/InternalUtils.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 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:
- *   CEA LIST - Initial API and implementation
- *   Christian W. Damus - bug 485220
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.extendedtypes.util;
-
-import java.lang.ref.WeakReference;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-/**
- * Utilities for internal use by rthe ExtendedTypes bundle.
- * 
- * @noreference This class is not intended to be referenced by clients.
- */
-public class InternalUtils {
-
-	/** A map of classes that have been successfully loaded, keyed on the class name optionally prepended by the plugin ID, if specified. */
-	private static Map<String, WeakReference<Class<?>>> successLookupTable = new HashMap<String, WeakReference<Class<?>>>();
-
-	/** A map of classes that could not be loaded, keyed on the class name, optionally prepended by the plugin ID if specified. */
-	private static Set<String> failureLookupTable = new HashSet<String>();
-
-	/** A map to hold the bundle to exception list */
-	private static Map<Bundle, Set<String>> bundleToExceptionsSetMap = new HashMap<Bundle, Set<String>>();
-
-	private InternalUtils() {
-		super();
-	}
-
-	/**
-	 * A utility method to load a class using its name and a given class loader.
-	 *
-	 * @param className
-	 *            The class name
-	 * @param bundle
-	 *            The class loader
-	 * @return The loaded class or <code>null</code> if could not be loaded
-	 */
-	public static Class<?> loadClass(String className, String pluginId) {
-		// FIXME: This method is grossly flawed, as it requires the class being loaded to be contained within the identified bundle, not anywhere on its classpath
-		StringBuffer keyStringBuf = new StringBuffer(className.length() + pluginId.length() + 2); // 2 is for . and extra.
-		keyStringBuf.append(pluginId);
-		keyStringBuf.append('.');
-		keyStringBuf.append(className);
-		String keyString = keyStringBuf.toString();
-		WeakReference<Class<?>> ref = successLookupTable.get(keyString);
-		Class<?> found = (ref != null) ? ref.get() : null;
-		if (found == null) {
-			if (ref != null) {
-				successLookupTable.remove(keyString);
-			}
-			if (!failureLookupTable.contains(keyString)) {
-				try {
-					Bundle bundle = basicGetPluginBundle(pluginId);
-					if (bundle != null) {
-						// never load the class if the bundle is not active other wise
-						// we will cause the plugin to load
-						// unless the class is in the exception list
-						int state = bundle.getState();
-						if (state == org.osgi.framework.Bundle.ACTIVE || isInExceptionList(bundle, className)) {
-							found = bundle.loadClass(className);
-							successLookupTable.put(keyString, new WeakReference<Class<?>>(found));
-							if (state == org.osgi.framework.Bundle.ACTIVE) {
-								bundleToExceptionsSetMap.remove(bundle);
-							}
-						}
-					} else {
-						failureLookupTable.add(keyString);
-					}
-				} catch (ClassNotFoundException e) {
-					failureLookupTable.add(keyString);
-				}
-			}
-		}
-		return found;
-	}
-
-	private static boolean isInExceptionList(Bundle bundle, String className) {
-		String packageName = className.substring(0, className.lastIndexOf('.'));
-		Set<String> exceptionSet = bundleToExceptionsSetMap.get(bundle);
-		if (exceptionSet == null) {
-			Dictionary<String, String> dict = bundle.getHeaders();
-			int index = -1;
-			String value = dict.get("Bundle-ActivationPolicy"); //$NON-NLS-1$
-			if (value != null) {
-				index = value.indexOf("lazy"); //$NON-NLS-1$
-				if (index >= 0) {
-					index = value.indexOf("exclude", index); //$NON-NLS-1$
-				}
-			}
-			if (index < 0) {
-				// Try the (very) old way
-				value = dict.get("Eclipse-LazyStart"); //$NON-NLS-1$
-				if (value != null) {
-					index = value.indexOf("exceptions"); //$NON-NLS-1$
-				}
-			}
-			if (index >= 0) {
-				try {
-					int start = value.indexOf('"', index + 1);
-					int end = value.indexOf('"', start + 1);
-					String exceptions = value.substring(start + 1, end);
-					exceptionSet = new HashSet<String>(2);
-					StringTokenizer tokenizer = new StringTokenizer(exceptions, ","); //$NON-NLS-1$
-					while (tokenizer.hasMoreTokens()) {
-						exceptionSet.add(tokenizer.nextToken().trim());
-					}
-				} catch (IndexOutOfBoundsException exception) {
-					// this means the MF did not follow the documented format for the exceptions list so i'll consider it empty
-					exceptionSet = Collections.emptySet();
-				}
-			} else {
-				exceptionSet = Collections.emptySet();
-			}
-			bundleToExceptionsSetMap.put(bundle, exceptionSet);
-		}
-		return exceptionSet.contains(packageName);
-	}
-
-	/**
-	 * Given a bundle id, it checks if the bundle is found and activated. If it
-	 * is, the method returns the bundle, otherwise it returns <code>null</code>.
-	 *
-	 * @param pluginId
-	 *            the bundle ID
-	 * @return the bundle, if found
-	 */
-	private static Bundle getPluginBundle(String pluginId) {
-		Bundle bundle = basicGetPluginBundle(pluginId);
-		if (null != bundle && bundle.getState() == org.osgi.framework.Bundle.ACTIVE) {
-			return bundle;
-		}
-		return null;
-	}
-
-	private static Bundle basicGetPluginBundle(String pluginId) {
-		return Platform.getBundle(pluginId);
-	}
-
-}
diff --git a/plugins/infra/xtypes/pom.xml b/plugins/infra/xtypes/pom.xml
deleted file mode 100644
index fc325def5f6..00000000000
--- a/plugins/infra/xtypes/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.eclipse.papyrus.infra-xtypes</artifactId>
-	<packaging>pom</packaging>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.infra</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-    </parent>
-	<name>Papyrus Infra Extended Element Types</name>
-	<description>Plug-ins contributing model-driven "extended" types to the GMF Run-time Element-Types registry.</description>
-
-	<modules>
-		<module>org.eclipse.papyrus.infra.extendedtypes</module>
-		<module>org.eclipse.papyrus.infra.extendedtypes.edit</module>
-		<module>org.eclipse.papyrus.infra.extendedtypes.emf</module>
-		<module>org.eclipse.papyrus.infra.extendedtypes.ui</module>
-	</modules>
-</project>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
index 945669db76c..a9b53dcef86 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
@@ -16,8 +16,7 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[2.0.0,3.0
  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.sysml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
index 5255bb3b46c..0a1c51ff214 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/provider/InheritedClassDiagramViewProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider;
 import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
 import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
@@ -95,20 +94,7 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 		if (elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
 			return true;
 		}
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the semantic nature and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-		// IElementType may be an extended type. Check for a view based on this element type
-		if (elementType instanceof IExtendedHintedElementType) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
-			}
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
+
 		// IElementType may be null (especially when drop from ModelExplorer).
 		// In such a case, test the semantic EObject instead.
 		if (elementType == null) {
@@ -240,22 +226,6 @@ public class InheritedClassDiagramViewProvider extends UMLViewProvider {
 			}
 			return false;
 		}
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the semantic nature and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-		// IElementType may be an extended type. Check for a view based on this element type
-		if (elementType instanceof IExtendedHintedElementType) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-			} else {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
-			}
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
 
 		// IElementType may be null (especially when drop from ModelExplorer).
 		// In such a case, test the semantic EObject instead.
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
index c6becc64ded..ace28886224 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
@@ -33,7 +33,6 @@ Require-Bundle: org.eclipse.emf;bundle-version="[2.6.0,3.0.0)",
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.uml.diagram.composite;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java
index d4c8adc8668..79e002153f3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockCompositeSemanticEditPolicy.java
@@ -13,13 +13,9 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
 import org.eclipse.papyrus.sysml.blocks.Block;
@@ -39,13 +35,6 @@ public class BlockCompositeSemanticEditPolicy extends DefaultCompartmentSemantic
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		// if extended type, retrieve the sysml closest element element type
-		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
-			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
-				baseType = SysMLElementTypes.FLOW_PORT_NA;
-			}
-		}
 
 		if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java
index 0415a91edc0..617b70b972a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyCompositeSemanticEditPolicy.java
@@ -13,15 +13,11 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
 import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;
@@ -50,24 +46,6 @@ public class BlockPropertyCompositeSemanticEditPolicy extends DefaultSemanticEdi
 
 				IElementType elementTypeToCreate = req.getElementType();
 				IElementType baseType = elementTypeToCreate;
-				// if extended type, retrieve the sysml closest element element type
-				if (elementTypeToCreate instanceof IExtendedHintedElementType) {
-					List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-					if (superTypes.contains(SysMLElementTypes.FLOW_PORT)) {
-						baseType = SysMLElementTypes.FLOW_PORT;
-					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN)) {
-						baseType = SysMLElementTypes.FLOW_PORT_IN;
-					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_OUT)) {
-						baseType = SysMLElementTypes.FLOW_PORT_OUT;
-					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN_OUT)) {
-						baseType = SysMLElementTypes.FLOW_PORT_IN_OUT;
-					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
-						baseType = SysMLElementTypes.FLOW_PORT_NA;
-					} else if (superTypes.contains(UMLElementTypes.PORT)) {
-						baseType = UMLElementTypes.PORT;
-					}
-				}
-
 
 				if ((SysMLElementTypes.FLOW_PORT == baseType)
 						|| (SysMLElementTypes.FLOW_PORT_IN == baseType)
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java
index 4764f371a5d..ddd9bde7798 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/BlockPropertyStructureCompartmentSemanticEditPolicy.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
 
 import java.util.Arrays;
-import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.commands.Command;
@@ -22,7 +21,6 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
 import org.eclipse.papyrus.sysml.blocks.Block;
@@ -56,25 +54,6 @@ public class BlockPropertyStructureCompartmentSemanticEditPolicy extends Default
 
 				IElementType elementTypeToCreate = req.getElementType();
 				IElementType baseType = elementTypeToCreate;
-				// if extended type, retrieve the sysml closest element element type
-				if (elementTypeToCreate instanceof IExtendedHintedElementType) {
-					List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-
-					if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
-						baseType = SysMLElementTypes.PART_PROPERTY;
-					} else if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
-						baseType = SysMLElementTypes.REFERENCE_PROPERTY;
-					} else if (superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
-						baseType = SysMLElementTypes.ACTOR_PART_PROPERTY;
-					} else if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
-						baseType = SysMLElementTypes.VALUE_PROPERTY;
-					} else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
-						baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
-					} else if (superTypes.contains(UMLElementTypes.PROPERTY)) {
-						baseType = UMLElementTypes.PROPERTY;
-					}
-
-				}
 
 				if (SysMLElementTypes.PART_PROPERTY == baseType) {
 					req.setContainer(type);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java
index e519f37c84e..8f025885fa7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ConstraintParameterCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
@@ -41,13 +37,6 @@ public class ConstraintParameterCompartmentSemanticEditPolicy extends DefaultCom
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		// if extended type, retrieve the sysml closest element element type
-		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
-			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if (superTypes.contains(UMLElementTypes.PROPERTY)) {
-				baseType = UMLElementTypes.PROPERTY;
-			}
-		}
 
 		if (UMLElementTypes.PROPERTY == baseType) {
 			String name = NamedElementUtil.getDefaultNameWithIncrementFromBase("parameter", req.getContainer().eContents()); //$NON-NLS-1$
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java
index 66ff6d11014..32d56b25ccd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/FlowPortCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
 import org.eclipse.papyrus.sysml.blocks.Block;
@@ -39,13 +35,6 @@ public class FlowPortCompartmentSemanticEditPolicy extends DefaultCompartmentSem
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		// if extended type, retrieve the sysml closest element element type
-		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
-			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
-				baseType = SysMLElementTypes.FLOW_PORT_NA;
-			}
-		}
 
 		if (SysMLElementTypes.FLOW_PORT_NA == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateFlowPortWithFlowSpecificationConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java
index 12016a1a816..0e66162a1eb 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/NestedBlockPropertyCompositeSemanticEditPolicy.java
@@ -13,15 +13,11 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
 import org.eclipse.papyrus.sysml.diagram.common.commands.CreateFlowPortWithFlowSpecificationConfigureCommandFactory;
@@ -52,23 +48,6 @@ public class NestedBlockPropertyCompositeSemanticEditPolicy extends DefaultSeman
 
 				IElementType elementTypeToCreate = req.getElementType();
 				IElementType baseType = elementTypeToCreate;
-				// if extended type, retrieve the sysml closest element element type
-				if (elementTypeToCreate instanceof IExtendedHintedElementType) {
-					List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-					if (superTypes.contains(SysMLElementTypes.FLOW_PORT)) {
-						baseType = SysMLElementTypes.FLOW_PORT;
-					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN)) {
-						baseType = SysMLElementTypes.FLOW_PORT_IN;
-					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_OUT)) {
-						baseType = SysMLElementTypes.FLOW_PORT_OUT;
-					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_IN_OUT)) {
-						baseType = SysMLElementTypes.FLOW_PORT_IN_OUT;
-					} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
-						baseType = SysMLElementTypes.FLOW_PORT_NA;
-					} else if (superTypes.contains(UMLElementTypes.PORT)) {
-						baseType = UMLElementTypes.PORT;
-					}
-				}
 
 				if ((SysMLElementTypes.FLOW_PORT == baseType)
 						|| (SysMLElementTypes.FLOW_PORT_IN == baseType)
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java
index 1a9a028e3a9..0e4c2c9e8c6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PartCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
 import org.eclipse.papyrus.sysml.blocks.Block;
@@ -40,16 +36,6 @@ public class PartCompartmentSemanticEditPolicy extends DefaultCompartmentSemanti
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		// if extended type, retrieve the sysml closest element element type
-		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
-			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
-				baseType = SysMLElementTypes.PART_PROPERTY;
-			} else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
-				baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
-			}
-		}
-
 
 		if (SysMLElementTypes.PART_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java
index f48e36139ed..13d12c9bb21 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/PropertyCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
 import org.eclipse.papyrus.sysml.blocks.Block;
@@ -44,24 +40,6 @@ public class PropertyCompartmentSemanticEditPolicy extends DefaultCompartmentSem
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		// if extended type, retrieve the sysml closest element element type
-		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
-			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
-				baseType = SysMLElementTypes.PART_PROPERTY;
-			} else if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
-				baseType = SysMLElementTypes.REFERENCE_PROPERTY;
-			} else if (superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
-				baseType = SysMLElementTypes.ACTOR_PART_PROPERTY;
-			} else if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
-				baseType = SysMLElementTypes.VALUE_PROPERTY;
-			} else if (superTypes.contains(SysMLElementTypes.FLOW_PORT_NA)) {
-				baseType = SysMLElementTypes.FLOW_PORT_NA;
-			} else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
-				baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
-			}
-		}
-
 
 		if (SysMLElementTypes.PART_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java
index ac078f5edbf..27d3bdde8f2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ReferenceCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
 import org.eclipse.papyrus.sysml.blocks.Block;
@@ -39,13 +35,6 @@ public class ReferenceCompartmentSemanticEditPolicy extends DefaultCompartmentSe
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		// if extended type, retrieve the sysml closest element element type
-		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
-			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
-				baseType = SysMLElementTypes.REFERENCE_PROPERTY;
-			}
-		}
 
 		if (SysMLElementTypes.REFERENCE_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateReferenceWithTypeConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java
index c6872ed20fc..7eaf6b6f49e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/StructureCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
 import org.eclipse.papyrus.sysml.blocks.Block;
@@ -43,21 +39,6 @@ public class StructureCompartmentSemanticEditPolicy extends DefaultCompartmentSe
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		// if extended type, retrieve the sysml closest element element type
-		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
-			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if (superTypes.contains(SysMLElementTypes.PART_PROPERTY)) {
-				baseType = SysMLElementTypes.PART_PROPERTY;
-			} else if (superTypes.contains(SysMLElementTypes.REFERENCE_PROPERTY)) {
-				baseType = SysMLElementTypes.REFERENCE_PROPERTY;
-			} else if (superTypes.contains(SysMLElementTypes.ACTOR_PART_PROPERTY)) {
-				baseType = SysMLElementTypes.ACTOR_PART_PROPERTY;
-			} else if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
-				baseType = SysMLElementTypes.VALUE_PROPERTY;
-			} else if (superTypes.contains(SysMLElementTypes.CONSTRAINT_PROPERTY)) {
-				baseType = SysMLElementTypes.CONSTRAINT_PROPERTY;
-			}
-		}
 
 		if (SysMLElementTypes.PART_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreatePartWithTypeConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java
index 8654ecb0b81..35e42a9121d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-sysml/org/eclipse/papyrus/sysml/diagram/common/edit/policy/ValueCompartmentSemanticEditPolicy.java
@@ -13,13 +13,9 @@
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.common.edit.policy;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
 import org.eclipse.papyrus.sysml.blocks.Block;
@@ -39,13 +35,6 @@ public class ValueCompartmentSemanticEditPolicy extends DefaultCompartmentSemant
 
 		IElementType elementTypeToCreate = req.getElementType();
 		IElementType baseType = elementTypeToCreate;
-		// if extended type, retrieve the sysml closest element element type
-		if (elementTypeToCreate instanceof IExtendedHintedElementType) {
-			List<IElementType> superTypes = Arrays.asList(elementTypeToCreate.getAllSuperTypes());
-			if (superTypes.contains(SysMLElementTypes.VALUE_PROPERTY)) {
-				baseType = SysMLElementTypes.VALUE_PROPERTY;
-			}
-		}
 
 		if (SysMLElementTypes.VALUE_PROPERTY == baseType) {
 			req.setParameter(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new CreateValueWithTypeConfigureCommandFactory());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
index 5eb6e8bfa6a..c895a9753af 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
@@ -16,8 +16,7 @@ Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock,
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.sysml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.sysml.service.types;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java
index ddecbff759b..513df2b5aae 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/provider/InheritedCompositeDiagramViewProvider.java
@@ -27,7 +27,6 @@ import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.gmf.diagram.common.provider.IGraphicalTypeRegistry;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.gmfdiag.common.commands.SemanticAdapter;
 //bugs.eclipse.org/bugs/show_bug.cgi?id=432824
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
@@ -97,20 +96,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 		if (elementType == ElementTypes.CONSTRAINT_CONSTRAINED_ELEMENT) {
 			return true;
 		}
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the semantic nature and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-		// IElementType may be an extended type. Check for a view based on this element type
-		if (elementType instanceof IExtendedHintedElementType) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getEdgeGraphicalType(domainElement);
-			}
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownEdgeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
+
 		// IElementType may be null (especially when drop from ModelExplorer).
 		// In such a case, test the semantic EObject instead.
 		if (elementType == null) {
@@ -162,22 +148,7 @@ public class InheritedCompositeDiagramViewProvider extends UMLViewProvider {
 				return true;
 			}
 		}
-		// /////////////////////////////////////////////////////////////////////
-		// Test possibility to provide a view based on the semantic nature and its expected container.
-		// /////////////////////////////////////////////////////////////////////
-		// IElementType may be an extended type. Check for a view based on this element type
-		if (elementType instanceof IExtendedHintedElementType) {
-			EObject domainElement = (EObject) op.getSemanticAdapter().getAdapter(EObject.class);
-			String domainElementGraphicalType = op.getSemanticHint();
-			if (domainElementGraphicalType == null) {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElement, containerGraphicalType);
-			} else {
-				domainElementGraphicalType = registry.getNodeGraphicalType(domainElementGraphicalType, containerGraphicalType);
-			}
-			if ((!org.eclipse.papyrus.infra.gmfdiag.common.providers.IGraphicalTypeRegistry.UNDEFINED_TYPE.equals(domainElementGraphicalType)) && (registry.isKnownNodeType(domainElementGraphicalType))) {
-				return true;
-			}
-		}
+
 
 		// IElementType may be null (especially when drop from ModelExplorer).
 		// In such a case, test the semantic EObject instead.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
index bdb3ec2f739..eee92929ef6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
@@ -44,7 +44,6 @@ Require-Bundle: org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3
  org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.widgets.toolbox;visibility:=reexport;bundle-version="[1.2.0,2.0.0)",

  org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",

  org.eclipse.emf.validation.ocl;visibility:=reexport;bundle-version="[1.4.0,2.0.0)",

  org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 6eb809dd8d0..59989d6022a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -305,47 +305,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	/**
 	 * @generated
 	 */
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
 	protected ICommand getSemanticCreationCommand(CreateElementRequest req) {
 		IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(req.getContainer());
 		if (commandService == null) {
@@ -479,8 +438,8 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canCreateAction_LocalPreconditionEdge(Action source, Constraint target) {
 			if (source != null) {
 				if (source.getLocalPreconditions().contains(target)) {
@@ -495,8 +454,8 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canCreateAction_LocalPostconditionEdge(Action source, Constraint target) {
 			if (source != null) {
 				if (source.getLocalPostconditions().contains(target)) {
@@ -511,30 +470,30 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canCreateObjectFlow_Edge(Activity container, ActivityNode source, ActivityNode target) {
 			return canExistObjectFlow_Edge(container, null, source, target);
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canCreateControlFlow_Edge(Activity container, ActivityNode source, ActivityNode target) {
 			return canExistControlFlow_Edge(container, null, source, target);
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canCreateExceptionHandler_Edge(ExecutableNode container, ExecutableNode source,
 				ObjectNode target) {
 			return canExistExceptionHandler_Edge(container, null, source, target);
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canCreateComment_AnnotatedElementEdge(Comment source, Element target) {
 			if (source != null) {
 				if (source.getAnnotatedElements().contains(target)) {
@@ -546,8 +505,8 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canCreateConstraint_ConstrainedElementEdge(Constraint source, Element target) {
 			if (source != null) {
 				if (source.getConstrainedElements().contains(target)) {
@@ -559,15 +518,15 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canExistAction_LocalPreconditionEdge(Action source, Constraint target) {
 			return true;
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canExistAction_LocalPostconditionEdge(Action source, Constraint target) {
 			return true;
 		}
@@ -756,8 +715,8 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canExistControlFlow_Edge(Activity container, ControlFlow linkInstance, ActivityNode source,
 				ActivityNode target) {
 			try {
@@ -806,7 +765,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 					}
 				}
 				if (source instanceof MergeNode) {
-					//rule validateMergeNode_validateOneOutgoingEdge
+					// rule validateMergeNode_validateOneOutgoingEdge
 					if (!source.getOutgoings().isEmpty()) {
 						return false;
 					}
@@ -911,23 +870,23 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canExistExceptionHandler_Edge(ExecutableNode container, ExceptionHandler linkInstance,
 				ExecutableNode source, ObjectNode target) {
 			return true;
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canExistComment_AnnotatedElementEdge(Comment source, Element target) {
 			return true;
 		}
 
 		/**
-		* @generated
-		*/
+		 * @generated
+		 */
 		public boolean canExistConstraint_ConstrainedElementEdge(Constraint source, Element target) {
 			return true;
 		}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java
index 8956fefd7db..71a4da9a3b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java
@@ -53,8 +53,6 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
@@ -373,22 +371,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */
 	protected boolean provides(CreateEdgeViewOperation op) {
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if (elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType)
-					|| (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
+
+		if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
+			return false; // foreign element type
 		}
-		//if (!org.eclipse.papyrus.uml.diagram.activity.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
+
 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();
 		if (elementTypeHint == null
 				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index deadbfbecfa..15b451cda3d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -37,7 +37,6 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 7c8283d43be..32ecd3d0288 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -276,48 +276,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;
 	}
 
-	// RS: add code for extended types
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
 	// RS: End of add code for extended types
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
index 025fcef5751..ce041b8a4b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
@@ -51,8 +51,6 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
@@ -268,22 +266,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */
 	protected boolean provides(CreateEdgeViewOperation op) {
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if (elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType)
-					|| (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
+
+		if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
+			return false; // foreign element type
 		}
-		//if (!org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
+		
 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();
 		if (elementTypeHint == null
 				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index a126f4fce14..92ff6a939c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
@@ -59,7 +59,6 @@ Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[1.2
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.7.0,2.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
index cbf9e02220a..c3af97d77fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
@@ -30,7 +30,6 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-v
  org.eclipse.uml2.uml.resources;bundle-version="[5.2.0,6.0.0)",
  org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java
index c9350b1c2e8..1d849f14d55 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/CommentItemSemanticEditPolicyCN.java
@@ -26,8 +26,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -93,28 +91,14 @@ public class CommentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

+			

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

+			

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -133,35 +117,19 @@ public class CommentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

+

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

+

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

+

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java
index a1f0bd44509..135243f9ede 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/ConstraintItemSemanticEditPolicyCN.java
@@ -26,8 +26,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

@@ -99,21 +97,8 @@ public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditP
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -121,9 +106,6 @@ public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditP
 			return null;

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -145,49 +127,24 @@ public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditP
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
index 4e22147e4f5..a2bf4f8a34d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
@@ -26,8 +26,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

@@ -99,21 +97,8 @@ public class DurationObservationItemSemanticEditPolicyCN extends UMLBaseItemSema
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -124,9 +109,6 @@ public class DurationObservationItemSemanticEditPolicyCN extends UMLBaseItemSema
 			return null;

 		}

 		if (UMLElementTypes.DurationObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -145,49 +127,24 @@ public class DurationObservationItemSemanticEditPolicyCN extends UMLBaseItemSema
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java
index fa5b3539543..3d6088b5035 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/InteractionItemSemanticEditPolicy.java
@@ -33,8 +33,6 @@ import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

@@ -276,21 +274,7 @@ public class InteractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -318,49 +302,23 @@ public class InteractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java
index 81e16149101..fc64234b262 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/LifelineItemSemanticEditPolicyCN.java
@@ -26,8 +26,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

@@ -99,21 +97,7 @@ public class LifelineItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -141,49 +125,24 @@ public class LifelineItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPol
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/MessageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/MessageItemSemanticEditPolicy.java
index ee218fcac87..0c7527be15c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/MessageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/MessageItemSemanticEditPolicy.java
@@ -24,8 +24,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

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

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

@@ -89,21 +87,8 @@ public class MessageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -131,49 +116,24 @@ public class MessageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java
index d0440c54aad..f024e8a8c5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/TimeObservationItemSemanticEditPolicyCN.java
@@ -26,8 +26,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.communication.edit.commands.ConnectorDurationObservationCreateCommand;

@@ -99,21 +97,8 @@ public class TimeObservationItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -127,9 +112,6 @@ public class TimeObservationItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 			return null;

 		}

 		if (UMLElementTypes.TimeObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -145,49 +127,24 @@ public class TimeObservationItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Path_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.DurationObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorDurationObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.TimeObservation_EventEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConnectorTimeObservationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/UMLBaseItemSemanticEditPolicy.java
index f224e99f462..56a72b54515 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -244,47 +244,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;
 	}
 
-	/**
-	* @generated
-	*/
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
 	// RS: End of add code for extended types
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java
index c798f5929be..388ecbf033a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src-gen/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java
@@ -51,8 +51,6 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
@@ -226,18 +224,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */
 	protected boolean provides(CreateEdgeViewOperation op) {
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if (elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType)
-					|| (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
+
+		if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
+			return false; // foreign element type
 		}
+		
 		//if (!org.eclipse.papyrus.uml.diagram.communication.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
 		//	return false; // foreign element type
 		//}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
index bed5dcd4f36..6190997e01e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)
  org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
index 4da8d70964f..675f181f015 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
@@ -28,8 +28,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

@@ -109,56 +107,28 @@ public class DefaultNamedElementItemSemanticEditPolicy extends UMLBaseItemSemant
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Usage_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new UsageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new SubstitutionCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new ManifestationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new AbstractionCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -169,16 +139,10 @@ public class DefaultNamedElementItemSemanticEditPolicy extends UMLBaseItemSemant
 			return null;

 		}

 		if (UMLElementTypes.Dependency_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new DependencyCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new DependencyBranchCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -194,21 +158,8 @@ public class DefaultNamedElementItemSemanticEditPolicy extends UMLBaseItemSemant
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Usage_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new UsageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -216,58 +167,34 @@ public class DefaultNamedElementItemSemanticEditPolicy extends UMLBaseItemSemant
 			return null;

 		}

 		if (UMLElementTypes.Substitution_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new SubstitutionCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new ManifestationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new AbstractionCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new DependencyCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new DependencyBranchCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java
index b2172511b1f..8cd9ae71350 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java
@@ -21,8 +21,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.component.edit.commands.AbstractionCreateCommand;

@@ -97,56 +95,27 @@ public class DependencyBranchItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

 		if (UMLElementTypes.Usage_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new UsageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.InterfaceRealization_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Substitution_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new SubstitutionCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new ManifestationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new AbstractionCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -157,16 +126,10 @@ public class DependencyBranchItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			return null;

 		}

 		if (UMLElementTypes.Dependency_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new DependencyCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new DependencyBranchCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -182,21 +145,8 @@ public class DependencyBranchItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Usage_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new UsageCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -204,58 +154,34 @@ public class DependencyBranchItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			return null;

 		}

 		if (UMLElementTypes.Substitution_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new SubstitutionCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Manifestation_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new ManifestationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.ComponentRealization_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new ComponentRealizationCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Abstraction_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new AbstractionCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new DependencyCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Dependency_BranchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, requestElementType);

-			}

 			return getGEFWrapper(new DependencyBranchCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
index c381722f3bc..83e923e1aa3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -254,47 +254,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;
 	}
 
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
 	// RS: End of add code for extended types
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
index 534083859cd..781b01c6c00 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src-gen/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
@@ -51,8 +51,6 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
@@ -309,22 +307,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */
 	protected boolean provides(CreateEdgeViewOperation op) {
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if (elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType)
-					|| (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
+
+		if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
+			return false; // foreign element type
 		}
-		//if (!org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
+
 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();
 		if (elementTypeHint == null
 				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
index 416abf123d2..083736e0b8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
@@ -37,7 +37,6 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version=
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
index c0232836889..f735f2cd6e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -269,48 +269,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;
 	}
 
-	// RS: add code for extended types
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
 	// RS: End of add code for extended types
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
index ffe9df063cd..c449219362d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src-gen/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
@@ -52,8 +52,6 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
@@ -281,22 +279,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */
 	protected boolean provides(CreateEdgeViewOperation op) {
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if (elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType)
-					|| (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
+
+		if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
+			return false; // foreign element type
 		}
-		//if (!org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
+
 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();
 		if (elementTypeHint == null
 				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
index aa5a867b422..b0a7016e2ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-v
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLBaseItemSemanticEditPolicy.java
index f87262fb99e..a37d3717d00 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -245,47 +245,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;
 	}
 
-	/**
-	* @generated
-	*/
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
 	// RS: End of add code for extended types
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java
index 126a775aa59..dc168d33b79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src-gen/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java
@@ -51,8 +51,6 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
@@ -314,22 +312,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */
 	protected boolean provides(CreateEdgeViewOperation op) {
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if (elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType)
-					|| (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
+
+		if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
+			return false; // foreign element type
 		}
-		//if (!org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
+
 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();
 		if (elementTypeHint == null
 				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
index 0ec47c324bc..a7ed53fbebf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.
  org.eclipse.papyrus.uml.diagram.activity;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.uml.tools;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
  org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[1.2.0,2.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
index d33ea647142..3d13131c96a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility
  org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)"
 Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,
  org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
index 047f354d2b8..ef1100330c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
@@ -32,7 +32,6 @@ Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.services.validation;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
  org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="[1.2.0,2.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 30b1af7bded..1a75846fee7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -251,47 +251,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;
 	}
 
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
 	// RS: End of add code for extended types
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java
index 00a72fd0fb7..388bbaeb73d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src-gen/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java
@@ -51,8 +51,6 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
@@ -222,22 +220,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */
 	protected boolean provides(CreateEdgeViewOperation op) {
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if (elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType)
-					|| (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
+
+		if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
+			return false; // foreign element type
 		}
-		//if (!org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
+
 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();
 		if (elementTypeHint == null
 				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
index d1d969c9e5f..7d039682161 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -23,7 +23,6 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.papyrus.uml.service.types;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.uml.diagram.menu;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ActionExecutionSpecificationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ActionExecutionSpecificationItemSemanticEditPolicy.java
index 700a2a86357..a67d0e1a1a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ActionExecutionSpecificationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ActionExecutionSpecificationItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -104,57 +102,26 @@ public class ActionExecutionSpecificationItemSemanticEditPolicy extends UMLBaseI
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -176,69 +143,32 @@ public class ActionExecutionSpecificationItemSemanticEditPolicy extends UMLBaseI
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/BehaviorExecutionSpecificationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/BehaviorExecutionSpecificationItemSemanticEditPolicy.java
index 5679b0f40c8..b0eea170d1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/BehaviorExecutionSpecificationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/BehaviorExecutionSpecificationItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -104,57 +102,26 @@ public class BehaviorExecutionSpecificationItemSemanticEditPolicy extends UMLBas
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -176,69 +143,32 @@ public class BehaviorExecutionSpecificationItemSemanticEditPolicy extends UMLBas
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragment2ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragment2ItemSemanticEditPolicy.java
index a1f69a04243..36281036d8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragment2ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragment2ItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -104,57 +102,26 @@ public class CombinedFragment2ItemSemanticEditPolicy extends UMLBaseItemSemantic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -176,69 +143,32 @@ public class CombinedFragment2ItemSemanticEditPolicy extends UMLBaseItemSemantic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java
index d64d7ede880..071a14d8b16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java
@@ -16,8 +16,6 @@ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;
 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.InteractionOperandCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

@@ -46,21 +44,8 @@ public class CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy e
 			return super.getCreateCommand(req);

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.InteractionOperand_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new InteractionOperandCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return super.getCreateCommand(req);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentItemSemanticEditPolicy.java
index 7ab8f0b9800..dc08c043c6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CombinedFragmentItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -103,57 +101,26 @@ public class CombinedFragmentItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -174,69 +141,32 @@ public class CombinedFragmentItemSemanticEditPolicy extends UMLBaseItemSemanticE
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java
index 1d5a3bdc863..2d70103632d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/CommentItemSemanticEditPolicy.java
@@ -28,8 +28,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -112,63 +110,29 @@ public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

@@ -186,69 +150,32 @@ public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConsiderIgnoreFragmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConsiderIgnoreFragmentItemSemanticEditPolicy.java
index 889e8a786bd..eda2c96e472 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConsiderIgnoreFragmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConsiderIgnoreFragmentItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -103,57 +101,26 @@ public class ConsiderIgnoreFragmentItemSemanticEditPolicy extends UMLBaseItemSem
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -174,69 +141,32 @@ public class ConsiderIgnoreFragmentItemSemanticEditPolicy extends UMLBaseItemSem
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java
index 29504a4faea..ca18ad7dc01 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ConstraintItemSemanticEditPolicy.java
@@ -28,8 +28,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -115,72 +113,35 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ContextEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ContextLinkCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

@@ -195,69 +156,32 @@ public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPol
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ContextEdge == baseElementType) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java
index 9baddd3d95a..3063ce08806 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ContinuationItemSemanticEditPolicy.java
@@ -28,8 +28,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -112,57 +110,26 @@ public class ContinuationItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -183,69 +150,32 @@ public class ContinuationItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionOccurrenceSpecificationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionOccurrenceSpecificationItemSemanticEditPolicy.java
index c8544f75df4..837678fe852 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionOccurrenceSpecificationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DestructionOccurrenceSpecificationItemSemanticEditPolicy.java
@@ -10,8 +10,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -93,57 +91,26 @@ public class DestructionOccurrenceSpecificationItemSemanticEditPolicy extends UM
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -153,9 +120,6 @@ public class DestructionOccurrenceSpecificationItemSemanticEditPolicy extends UM
 			return null;

 		}

 		if (UMLElementTypes.GeneralOrdering_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new GeneralOrderingCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

@@ -170,75 +134,35 @@ public class DestructionOccurrenceSpecificationItemSemanticEditPolicy extends UM
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.GeneralOrdering_Edge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new GeneralOrderingCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java
index 2a0162103a4..3cdfe3f78a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintInMessageItemSemanticEditPolicy.java
@@ -28,8 +28,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -115,72 +113,35 @@ public class DurationConstraintInMessageItemSemanticEditPolicy extends UMLBaseIt
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ContextEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ContextLinkCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

@@ -195,69 +156,32 @@ public class DurationConstraintInMessageItemSemanticEditPolicy extends UMLBaseIt
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ContextEdge == baseElementType) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java
index 978cc880479..f117350127b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationConstraintItemSemanticEditPolicy.java
@@ -28,8 +28,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -115,72 +113,35 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ContextEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ContextLinkCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

@@ -195,69 +156,32 @@ public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanti
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+		

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ContextEdge == baseElementType) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java
index 535cc7b98fb..342c495db52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/DurationObservationItemSemanticEditPolicy.java
@@ -28,8 +28,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -112,57 +110,26 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -183,69 +150,32 @@ public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemant
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
index 3f63971e3c9..06d695f64a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
@@ -13,8 +13,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

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

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -89,57 +87,26 @@ public class GeneralOrderingItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -160,69 +127,32 @@ public class GeneralOrderingItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionInteractionCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionInteractionCompartmentItemSemanticEditPolicy.java
index de9c1c88b29..ea8f0194258 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionInteractionCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionInteractionCompartmentItemSemanticEditPolicy.java
@@ -16,8 +16,6 @@ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies;
 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CombinedFragmentCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentCreateCommand;

@@ -49,51 +47,23 @@ public class InteractionInteractionCompartmentItemSemanticEditPolicy extends UML
 			return super.getCreateCommand(req);

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.ConsiderIgnoreFragment_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConsiderIgnoreFragmentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.CombinedFragment_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CombinedFragmentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.Lifeline_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new LifelineCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.InteractionUse_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new InteractionUseCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.Constraint_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.Comment_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return super.getCreateCommand(req);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionItemSemanticEditPolicy.java
index bda0683077c..351d7b37a07 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionItemSemanticEditPolicy.java
@@ -24,8 +24,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

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

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

@@ -85,27 +83,11 @@ public class InteractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			return super.getCreateCommand(req);

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.DurationConstraint_Shape_CN == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new DurationConstraintInMessageCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.DurationObservation_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new DurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return super.getCreateCommand(req);

@@ -146,57 +128,26 @@ public class InteractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -220,75 +171,35 @@ public class InteractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ContextEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ContextLinkCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandItemSemanticEditPolicy.java
index 6335e70608a..3bea35ab50a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionOperandItemSemanticEditPolicy.java
@@ -24,8 +24,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

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

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

@@ -87,39 +85,17 @@ public class InteractionOperandItemSemanticEditPolicy extends UMLBaseItemSemanti
 			return super.getCreateCommand(req);

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.InteractionUse_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new InteractionUseCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.ConsiderIgnoreFragment_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConsiderIgnoreFragmentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.CombinedFragment_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CombinedFragmentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.Continuation_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ContinuationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return super.getCreateCommand(req);

@@ -160,57 +136,26 @@ public class InteractionOperandItemSemanticEditPolicy extends UMLBaseItemSemanti
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -234,75 +179,35 @@ public class InteractionOperandItemSemanticEditPolicy extends UMLBaseItemSemanti
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ContextEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ContextLinkCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java
index 70f805de426..ce90e63e018 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionUseItemSemanticEditPolicy.java
@@ -28,8 +28,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -112,57 +110,26 @@ public class InteractionUseItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -183,69 +150,32 @@ public class InteractionUseItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineItemSemanticEditPolicy.java
index 089306768c1..6764a13baf3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/LifelineItemSemanticEditPolicy.java
@@ -24,8 +24,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

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

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

@@ -91,63 +89,29 @@ public class LifelineItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return super.getCreateCommand(req);

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.ActionExecutionSpecification_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ActionExecutionSpecificationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.BehaviorExecutionSpecification_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new BehaviorExecutionSpecificationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.StateInvariant_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new StateInvariantCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.CombinedFragment_CoRegionShape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CombinedFragment2CreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.TimeConstraint_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new TimeConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.TimeObservation_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new TimeObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.DurationConstraint_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new DurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if (UMLElementTypes.DestructionOccurrenceSpecification_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new DestructionOccurrenceSpecificationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return super.getCreateCommand(req);

@@ -189,57 +153,26 @@ public class LifelineItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -261,69 +194,32 @@ public class LifelineItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message2ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message2ItemSemanticEditPolicy.java
index c745fbc1513..f3d63c51684 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message2ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message2ItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -105,57 +103,26 @@ public class Message2ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -176,69 +143,32 @@ public class Message2ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message3ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message3ItemSemanticEditPolicy.java
index 0d3c304fd24..2453bdb30fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message3ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message3ItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -103,57 +101,26 @@ public class Message3ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -174,69 +141,32 @@ public class Message3ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message4ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message4ItemSemanticEditPolicy.java
index c5f6c78b5a4..242d21bae22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message4ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message4ItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -103,57 +101,26 @@ public class Message4ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -174,69 +141,32 @@ public class Message4ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message5ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message5ItemSemanticEditPolicy.java
index 78fcf962bc3..5010e3fcc10 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message5ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message5ItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -103,57 +101,26 @@ public class Message5ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -174,69 +141,32 @@ public class Message5ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message6ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message6ItemSemanticEditPolicy.java
index d9650c7829b..3d0537d97ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message6ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message6ItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -103,57 +101,26 @@ public class Message6ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -174,69 +141,32 @@ public class Message6ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message7ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message7ItemSemanticEditPolicy.java
index 04ca481a867..c8236fe3a20 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message7ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/Message7ItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -103,57 +101,26 @@ public class Message7ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -174,69 +141,32 @@ public class Message7ItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageItemSemanticEditPolicy.java
index 598b365a5ca..d62f8397b92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/MessageItemSemanticEditPolicy.java
@@ -23,8 +23,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

@@ -103,57 +101,26 @@ public class MessageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -174,69 +141,32 @@ public class MessageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/PackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/PackageItemSemanticEditPolicy.java
index 5c48c9645e1..6ca7be50799 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/PackageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/PackageItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

 import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.common.commands.DuplicateNamedElementCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.InteractionCreateCommand;

@@ -49,21 +47,8 @@ public class PackageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy
 			return super.getCreateCommand(req);

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Interaction_Shape == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new InteractionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return super.getCreateCommand(req);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java
index 0e021290c45..5dfb55ac246 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/StateInvariantItemSemanticEditPolicy.java
@@ -28,8 +28,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -112,57 +110,26 @@ public class StateInvariantItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -183,69 +150,32 @@ public class StateInvariantItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java
index 6140ba4c48b..761ffd49216 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeConstraintItemSemanticEditPolicy.java
@@ -28,8 +28,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -115,72 +113,35 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ContextEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ContextLinkCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

@@ -195,69 +156,32 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ContextEdge == baseElementType) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java
index 2f020d5c6bb..a3876be9705 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/TimeObservationItemSemanticEditPolicy.java
@@ -28,8 +28,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintConstrainedElementCreateCommand;

@@ -112,57 +110,26 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

@@ -183,69 +150,32 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message2CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message3CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message4CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message5CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message6CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new Message7CreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Comment_AnnotatedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Constraint_ConstrainedElementEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

 		}

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java
index cf62e7d9187..b167a1b1894 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -246,47 +246,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 	/**
 	 * @generated
 	 */
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
 	protected Command getSetCommand(SetRequest req) {
 		return null;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java
index c91131a371a..f7c318aba4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java
@@ -53,8 +53,6 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
@@ -282,22 +280,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */
 	protected boolean provides(CreateEdgeViewOperation op) {
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if (elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType)
-					|| (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
+
+		if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
+			return false; // foreign element type
 		}
-		//if (!org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
+
 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();
 		if (elementTypeHint == null
 				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
index f24cab2918c..348a62e6eb2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
@@ -33,7 +33,6 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[1.2.0,2.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 4d70e403b94..f2eae1e0ee4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -239,45 +239,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;
 	}
 
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if(provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if(provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if(provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
 	// RS: End of add code for extended types
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java
index 8277b5d99fc..56eb755b07e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java
@@ -51,8 +51,6 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
@@ -270,21 +268,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */
 	protected boolean provides(CreateEdgeViewOperation op) {
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if(elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if(!UMLElementTypes.isKnownElementType(closestNonExtendedType) || (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if(!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
+		
+		if(!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
+			return false; // foreign element type
 		}
-		//if (!org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
+		
 		String elementTypeHint = ((IHintedType)elementType).getSemanticHint();
 		if(elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
 			return false; // our hint is visual id and must be specified, and it should be the same as in element type
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
index 81f3894ad71..78e69aa8e9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
@@ -32,7 +32,6 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/CompactLifelineItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/CompactLifelineItemSemanticEditPolicyCN.java
index 28d6af7553d..757b4b4f00a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/CompactLifelineItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/CompactLifelineItemSemanticEditPolicyCN.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -67,8 +65,7 @@ public class CompactLifelineItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 	 */

 	@Override

 	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

-		Command command = req.getTarget() == null ?

-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

 		return command != null ? command : super.getCreateRelationshipCommand(req);

 	}

 

@@ -81,24 +78,11 @@ public class CompactLifelineItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +98,8 @@ public class CompactLifelineItemSemanticEditPolicyCN extends UMLBaseItemSemantic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/CompactStateInvariantItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/CompactStateInvariantItemSemanticEditPolicyCN.java
index 87f0a93c81a..16148083a6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/CompactStateInvariantItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/CompactStateInvariantItemSemanticEditPolicyCN.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class CompactStateInvariantItemSemanticEditPolicyCN extends UMLBaseItemSe
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class CompactStateInvariantItemSemanticEditPolicyCN extends UMLBaseItemSe
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DestructionOccurrenceSpecificationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DestructionOccurrenceSpecificationItemSemanticEditPolicyCN.java
index 721b1fdc009..d04988e78d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DestructionOccurrenceSpecificationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DestructionOccurrenceSpecificationItemSemanticEditPolicyCN.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageAsyncCreateCommand;

@@ -96,63 +94,32 @@ public class DestructionOccurrenceSpecificationItemSemanticEditPolicyCN extends
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageSyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageAsyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageReplyCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageDeleteCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -168,63 +135,32 @@ public class DestructionOccurrenceSpecificationItemSemanticEditPolicyCN extends
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageSyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageAsyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageReplyCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageDeleteCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
index 60688f64a96..d29cc400d9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class DurationConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class DurationConstraintItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DurationObservationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
index 736708b5961..91d1fb5daa4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/DurationObservationItemSemanticEditPolicyCN.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class DurationObservationItemSemanticEditPolicyCN extends UMLBaseItemSema
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class DurationObservationItemSemanticEditPolicyCN extends UMLBaseItemSema
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/FullLifelineItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/FullLifelineItemSemanticEditPolicyCN.java
index 840a44b8651..af615b837ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/FullLifelineItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/FullLifelineItemSemanticEditPolicyCN.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class FullLifelineItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class FullLifelineItemSemanticEditPolicyCN extends UMLBaseItemSemanticEdi
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/FullStateInvariantItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/FullStateInvariantItemSemanticEditPolicyCN.java
index 6861bab0a67..1372c030929 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/FullStateInvariantItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/FullStateInvariantItemSemanticEditPolicyCN.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class FullStateInvariantItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class FullStateInvariantItemSemanticEditPolicyCN extends UMLBaseItemSeman
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/GateItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/GateItemSemanticEditPolicy.java
index cb55f223556..622ffd2e9c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/GateItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/GateItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageAsyncCreateCommand;

@@ -96,63 +94,32 @@ public class GateItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageSyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageAsyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageReplyCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageDeleteCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -168,63 +135,32 @@ public class GateItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageSyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageAsyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageReplyCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageDeleteCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/GeneralOrderingItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
index 26f25ca772b..c76159d2ce1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/GeneralOrderingItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class GeneralOrderingItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class GeneralOrderingItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/InteractionNodeItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/InteractionNodeItemSemanticEditPolicyTN.java
index 3afa0bc563e..997c972ae7e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/InteractionNodeItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/InteractionNodeItemSemanticEditPolicyTN.java
@@ -21,8 +21,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

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

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

@@ -103,24 +101,11 @@ public class InteractionNodeItemSemanticEditPolicyTN extends UMLBaseItemSemantic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -136,21 +121,8 @@ public class InteractionNodeItemSemanticEditPolicyTN extends UMLBaseItemSemantic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/LifelineItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/LifelineItemSemanticEditPolicy.java
index e903cfbc6e2..6d7231dce8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/LifelineItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/LifelineItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class LifelineItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class LifelineItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolic
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageAsyncItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageAsyncItemSemanticEditPolicy.java
index a7f17d502ad..c837c369205 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageAsyncItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageAsyncItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class MessageAsyncItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class MessageAsyncItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageCreateItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageCreateItemSemanticEditPolicy.java
index 41b4032e247..736a2e14f51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageCreateItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageCreateItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class MessageCreateItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class MessageCreateItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageDeleteItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageDeleteItemSemanticEditPolicy.java
index 8d749b92571..60966295ea9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageDeleteItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageDeleteItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class MessageDeleteItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class MessageDeleteItemSemanticEditPolicy extends UMLBaseItemSemanticEdit
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageFoundItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageFoundItemSemanticEditPolicy.java
index 8e8ffb7b104..0b881c2575a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageFoundItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageFoundItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class MessageFoundItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class MessageFoundItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageLostItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageLostItemSemanticEditPolicy.java
index ee7077787da..f6ed0f080d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageLostItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageLostItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class MessageLostItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class MessageLostItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageOccurrenceSpecificationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageOccurrenceSpecificationItemSemanticEditPolicyCN.java
index a7ecc336d7b..67b78c8c5f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageOccurrenceSpecificationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageOccurrenceSpecificationItemSemanticEditPolicyCN.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageAsyncCreateCommand;

@@ -96,63 +94,32 @@ public class MessageOccurrenceSpecificationItemSemanticEditPolicyCN extends UMLB
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageSyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageAsyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageReplyCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageDeleteCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -168,63 +135,32 @@ public class MessageOccurrenceSpecificationItemSemanticEditPolicyCN extends UMLB
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_SynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageSyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_AsynchEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageAsyncCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_ReplyEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageReplyCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_CreateEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageCreateCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_DeleteEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageDeleteCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageReplyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageReplyItemSemanticEditPolicy.java
index f59f454035b..1e0f599f4d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageReplyItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageReplyItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class MessageReplyItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class MessageReplyItemSemanticEditPolicy extends UMLBaseItemSemanticEditP
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageSyncItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageSyncItemSemanticEditPolicy.java
index 52327fbcf5e..8c62d1bcabf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageSyncItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/MessageSyncItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class MessageSyncItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class MessageSyncItemSemanticEditPolicy extends UMLBaseItemSemanticEditPo
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/OccurrenceSpecificationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/OccurrenceSpecificationItemSemanticEditPolicyCN.java
index d9e2ebafe41..c09c901905c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/OccurrenceSpecificationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/OccurrenceSpecificationItemSemanticEditPolicyCN.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class OccurrenceSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class OccurrenceSpecificationItemSemanticEditPolicyCN extends UMLBaseItem
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/TimeConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/TimeConstraintItemSemanticEditPolicy.java
index 45af1717215..597b5d24dba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/TimeConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/TimeConstraintItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/TimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/TimeObservationItemSemanticEditPolicy.java
index 426907dbf52..12d165cb73f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/TimeObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/TimeObservationItemSemanticEditPolicy.java
@@ -20,8 +20,6 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

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

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

-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

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

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

 import org.eclipse.papyrus.uml.diagram.timing.edit.commands.MessageFoundCreateCommand;

@@ -81,24 +79,11 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

 			return null;

 		}

 		if (UMLElementTypes.Message_FoundEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageFoundCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

@@ -114,21 +99,8 @@ public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEd
 			return null;

 		}

 		IElementType baseElementType = requestElementType;

-		boolean isExtendedType = false;

-		if (requestElementType instanceof IExtendedHintedElementType) {

-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

-			if (baseElementType != null) {

-				isExtendedType = true;

-			} else {

-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);

-				isExtendedType = true;

-			}

-		}

+

 		if (UMLElementTypes.Message_LostEdge == baseElementType) {

-			if (isExtendedType) {

-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);

-			}

 			return getGEFWrapper(new MessageLostCreateCommand(req,

 					req.getSource(), req.getTarget()));

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/UMLBaseItemSemanticEditPolicy.java
index ac1af72fb72..70fcb21e3d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -235,47 +235,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;
 	}
 
-	/**
-	* @generated
-	*/
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
 	// RS: End of add code for extended types
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/providers/UMLViewProvider.java
index c034132cd00..ebbee6c8d2e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src-gen/org/eclipse/papyrus/uml/diagram/timing/providers/UMLViewProvider.java
@@ -51,8 +51,6 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
@@ -286,22 +284,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */
 	protected boolean provides(CreateEdgeViewOperation op) {
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if (elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType)
-					|| (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
+		
+		if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
+			return false; // foreign element type
 		}
-		//if (!org.eclipse.papyrus.uml.diagram.timing.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
+		
 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();
 		if (elementTypeHint == null
 				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
index 9e196ed99ca..4b874cc0991 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
@@ -34,7 +34,6 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version=
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 48ce4172cf9..5a7b71fd1d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -258,48 +258,6 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		return null;
 	}
 
-	// RS: add code for extended types
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request,
-			IElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
 	// RS: End of add code for extended types
 	/**
 	 * @generated
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
index 444339a3f9c..8c5bd169cba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src-gen/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
@@ -51,8 +51,6 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
 import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
@@ -312,22 +310,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 */
 	protected boolean provides(CreateEdgeViewOperation op) {
 		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if (elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType)
-					|| (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
+		
+		if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
+			return false; // foreign element type
 		}
-		//if (!org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
+		
 		String elementTypeHint = ((IHintedType) elementType).getSemanticHint();
 		if (elementTypeHint == null
 				|| (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath
index 8d79e849ffb..f0c55498599 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/.classpath
@@ -4,6 +4,5 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry exported="true" kind="lib" path="bin" sourcepath="bin"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.classpath b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.classpath
deleted file mode 100644
index afb9bb46ef3..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

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

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

-	<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="output" path="bin"/>

-</classpath>

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.project b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.project
deleted file mode 100644
index 92bc6e0ee7b..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.project
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.uml.tools.extendedtypes</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>
-		<buildCommand>
-			<name>org.eclipse.oomph.version.VersionBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>check.maven.pom</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>ignore.lower.bound.dependency.ranges</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.oomph.version.VersionNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.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/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.settings/org.eclipse.jdt.ui.prefs b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.settings/org.eclipse.pde.api.tools.prefs b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 23fb95e120f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,98 +0,0 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-API_USE_SCAN_FIELD_SEVERITY=Error
-API_USE_SCAN_METHOD_SEVERITY=Error
-API_USE_SCAN_TYPE_SEVERITY=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_ANNOTATION=Ignore
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-MISSING_EE_DESCRIPTIONS=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=Enabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Warning
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF
deleted file mode 100644
index 645d87ff352..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.extendedtypes.emf;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.properties;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)"
-Export-Package: org.eclipse.papyrus.uml.tools.extendedtypes,
- org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration,
- org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl,
- org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util,
- org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration,
- org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl,
- org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.util,
- org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration,
- org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl,
- org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.util,
- org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration,
- org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl,
- org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.uml.tools.extendedtypes.Activator$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.extendedtypes;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/about.html b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/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/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/build.properties b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/build.properties
deleted file mode 100644
index 2a428ee4b1e..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#

-#Mon Sep 12 09:29:52 CEST 2011

-output..=bin/

-bin.includes=.,model/,META-INF/,plugin.xml,plugin.properties,about.html,icons/

-jars.compile.order=.

-src.includes = about.html

-source..=src-gen/,src/

-bin..=bin/

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/icons/Stereotype.gif b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/icons/Stereotype.gif
deleted file mode 100644
index b7ae8706f73..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/icons/Stereotype.gif
+++ /dev/null
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/ApplyStereotypeActionConfiguration.ecore b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/ApplyStereotypeActionConfiguration.ecore
deleted file mode 100644
index 8fe7b9866c8..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/ApplyStereotypeActionConfiguration.ecore
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage 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" name="applystereotypeactionconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"

-    nsPrefix="applystereotypeactionconfiguration">

-  <eClassifiers xsi:type="ecore:EClass" name="ApplyStereotypeActionConfiguration"

-      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotypesToApply" upperBound="-1"

-        eType="#//StereotypeToApply" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="StereotypeToApply">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeQualifiedName"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="updateName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredProfiles" lowerBound="1"

-        upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"

-        eType="#//FeatureToSet" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"

-        eType="#//FeatureValue" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>

-  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>

-</ecore:EPackage>

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/ApplyStereotypeActionConfiguration.ecorediag b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/ApplyStereotypeActionConfiguration.ecorediag
deleted file mode 100644
index 112b44b0f51..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/ApplyStereotypeActionConfiguration.ecorediag
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram 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" xmi:id="_VmEr0P4DEd-H0IKqF9Gf4w" type="EcoreTools" name="ApplyStereotypeActionConfiguration" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_k1kC4P4FEd-H0IKqF9Gf4w" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_k1290P4FEd-H0IKqF9Gf4w" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_k1290f4FEd-H0IKqF9Gf4w" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_k1290v4FEd-H0IKqF9Gf4w"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_k1291f4FEd-H0IKqF9Gf4w" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_k1291v4FEd-H0IKqF9Gf4w"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_k1kC4f4FEd-H0IKqF9Gf4w" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ApplyStereotypeActionConfiguration.ecore#//ApplyStereotypeActionConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k1kC4v4FEd-H0IKqF9Gf4w" x="115" y="270" width="293" height="43"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_oodFsP4FEd-H0IKqF9Gf4w" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_oodFs_4FEd-H0IKqF9Gf4w" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_oodFtP4FEd-H0IKqF9Gf4w" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_qJmvYP4FEd-H0IKqF9Gf4w" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ApplyStereotypeActionConfiguration.ecore#//StereotypeToApply/stereotypeQualifiedName"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_qJmvYf4FEd-H0IKqF9Gf4w"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_taFBoP4FEd-H0IKqF9Gf4w" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ApplyStereotypeActionConfiguration.ecore#//StereotypeToApply/updateName"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_taFBof4FEd-H0IKqF9Gf4w"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_jAOWcCo6EeC-g4g96tuXkQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ApplyStereotypeActionConfiguration.ecore#//StereotypeToApply/requiredProfiles"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jAOWcSo6EeC-g4g96tuXkQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_oodFtf4FEd-H0IKqF9Gf4w"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_oodFuP4FEd-H0IKqF9Gf4w" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_oodFuf4FEd-H0IKqF9Gf4w"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_oodFsf4FEd-H0IKqF9Gf4w" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ApplyStereotypeActionConfiguration.ecore#//StereotypeToApply"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oodFsv4FEd-H0IKqF9Gf4w" x="549" y="259" width="249" height="84"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_oi-DAIdrEeOi95YnkGlwiQ" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_oj3a4IdrEeOi95YnkGlwiQ" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_oj3a4YdrEeOi95YnkGlwiQ" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_ojH0AIdrEeOi95YnkGlwiQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_ojH0AYdrEeOi95YnkGlwiQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ojH0AodrEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ojH0BYdrEeOi95YnkGlwiQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ojH0BodrEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_oi-DAYdrEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oi-DAodrEeOi95YnkGlwiQ" x="170" y="115"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_zF9goIdrEeOi95YnkGlwiQ" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zKuE0IdrEeOi95YnkGlwiQ" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zKuE0YdrEeOi95YnkGlwiQ" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_zF9go4drEeOi95YnkGlwiQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_zF9gpIdrEeOi95YnkGlwiQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zF9gpYdrEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_zF9gqIdrEeOi95YnkGlwiQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zF9gqYdrEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zF9goYdrEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zF9goodrEeOi95YnkGlwiQ" x="370" y="720"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_4BEIsIdrEeOi95YnkGlwiQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_4BEIs4drEeOi95YnkGlwiQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_4BEItIdrEeOi95YnkGlwiQ" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_5dOksIdrEeOi95YnkGlwiQ" type="2001">

-        <element xmi:type="ecore:EAttribute" href="ApplyStereotypeActionConfiguration.ecore#//FeatureToSet/featureName"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5dOksYdrEeOi95YnkGlwiQ"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_4BEItYdrEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_4BEIuIdrEeOi95YnkGlwiQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_4BEIuYdrEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_4BEIsYdrEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ApplyStereotypeActionConfiguration.ecore#//FeatureToSet"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4BEIsodrEeOi95YnkGlwiQ" x="272" y="425"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_FZx2QIdsEeOi95YnkGlwiQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_FZx2Q4dsEeOi95YnkGlwiQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_FZx2RIdsEeOi95YnkGlwiQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FZx2RYdsEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_FZx2SIdsEeOi95YnkGlwiQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_FZx2SYdsEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_FZx2QYdsEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ApplyStereotypeActionConfiguration.ecore#//FeatureValue"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FZx2QodsEeOi95YnkGlwiQ" x="580" y="425" width="193" height="68"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_MMNMUIdsEeOi95YnkGlwiQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_MMNMU4dsEeOi95YnkGlwiQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_MMNMVIdsEeOi95YnkGlwiQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_MMNMVYdsEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_MMNMWIdsEeOi95YnkGlwiQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_MMNMWYdsEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_MMNMUYdsEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ApplyStereotypeActionConfiguration.ecore#//ListValue"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MMNMUodsEeOi95YnkGlwiQ" x="690" y="565"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_TDFkkIdsEeOi95YnkGlwiQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_TDOugIdsEeOi95YnkGlwiQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_TDOugYdsEeOi95YnkGlwiQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_TDOugodsEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_TDOuhYdsEeOi95YnkGlwiQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_TDOuhodsEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_TDFkkYdsEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ApplyStereotypeActionConfiguration.ecore#//ConstantValue"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TDFkkodsEeOi95YnkGlwiQ" x="460" y="560"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_Y_f4oIdsEeOi95YnkGlwiQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_Y_f4o4dsEeOi95YnkGlwiQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_Y_f4pIdsEeOi95YnkGlwiQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Y_f4pYdsEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Y_f4qIdsEeOi95YnkGlwiQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_Y_f4qYdsEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_Y_f4oYdsEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ApplyStereotypeActionConfiguration.ecore#//DynamicValue"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_f4oodsEeOi95YnkGlwiQ" x="160" y="560" width="202" height="47"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_dH4DQIdsEeOi95YnkGlwiQ" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_dH4DQ4dsEeOi95YnkGlwiQ" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_dH4DRIdsEeOi95YnkGlwiQ" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_dH4DRYdsEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_dH4DSIdsEeOi95YnkGlwiQ" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_dH4DSYdsEeOi95YnkGlwiQ"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_dH4DQYdsEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="ApplyStereotypeActionConfiguration.ecore#//QueryExecutionValue"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dH4DQodsEeOi95YnkGlwiQ" x="140" y="715" width="183"/>

-  </children>

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

-  <element xmi:type="ecore:EPackage" href="ApplyStereotypeActionConfiguration.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_zjnLsP4FEd-H0IKqF9Gf4w" type="3002" source="_k1kC4P4FEd-H0IKqF9Gf4w" target="_oodFsP4FEd-H0IKqF9Gf4w">

-    <children xmi:type="notation:Node" xmi:id="_zkNooP4FEd-H0IKqF9Gf4w" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_zkNoof4FEd-H0IKqF9Gf4w" x="-42" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_zkNoov4FEd-H0IKqF9Gf4w" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_zkNoo_4FEd-H0IKqF9Gf4w" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zjnLsf4FEd-H0IKqF9Gf4w" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_zjnLsv4FEd-H0IKqF9Gf4w" fontColor="4210752" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="ApplyStereotypeActionConfiguration.ecore#//ApplyStereotypeActionConfiguration/stereotypesToApply"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zjnLs_4FEd-H0IKqF9Gf4w" points="[53, -1, -177, 1]$[231, -21, 1, -19]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zkzegP4FEd-H0IKqF9Gf4w" id="(0.7654867256637168,0.2619047619047619)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zkzegf4FEd-H0IKqF9Gf4w" id="(0.012048192771084338,0.23809523809523808)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ojtp4IdrEeOi95YnkGlwiQ" type="3003" source="_k1kC4P4FEd-H0IKqF9Gf4w" target="_oi-DAIdrEeOi95YnkGlwiQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ojtp4YdrEeOi95YnkGlwiQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ojtp4odrEeOi95YnkGlwiQ" fontName="Segoe UI"/>

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

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ojtp44drEeOi95YnkGlwiQ" points="[0, -20, -2, 126]$[0, -117, -2, 29]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_BkdKgIdsEeOi95YnkGlwiQ" type="3002" source="_oodFsP4FEd-H0IKqF9Gf4w" target="_4BEIsIdrEeOi95YnkGlwiQ">

-    <children xmi:type="notation:Node" xmi:id="_BkdKhIdsEeOi95YnkGlwiQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_BkdKhYdsEeOi95YnkGlwiQ" x="33" y="50"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_BkdKhodsEeOi95YnkGlwiQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_BkdKh4dsEeOi95YnkGlwiQ" x="33" y="-19"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_BkdKgYdsEeOi95YnkGlwiQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_BkdKgodsEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="ApplyStereotypeActionConfiguration.ecore#//StereotypeToApply/featuresToSet"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BkdKg4dsEeOi95YnkGlwiQ" points="[-58, 0, 186, -105]$[-252, 0, -8, -105]$[-252, 97, -8, -8]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BkmUcIdsEeOi95YnkGlwiQ" id="(0.23694779116465864,0.8452380952380952)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BkmUcYdsEeOi95YnkGlwiQ" id="(0.5849056603773585,0.1323529411764706)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_HqiX8IdsEeOi95YnkGlwiQ" type="3002" source="_4BEIsIdrEeOi95YnkGlwiQ" target="_FZx2QIdsEeOi95YnkGlwiQ">

-    <children xmi:type="notation:Node" xmi:id="_HqiX9IdsEeOi95YnkGlwiQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_HqiX9YdsEeOi95YnkGlwiQ" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_HqiX9odsEeOi95YnkGlwiQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_HqiX94dsEeOi95YnkGlwiQ" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_HqiX8YdsEeOi95YnkGlwiQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_HqiX8odsEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="ApplyStereotypeActionConfiguration.ecore#//FeatureToSet/value"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HqiX84dsEeOi95YnkGlwiQ" points="[27, 0, -171, 1]$[199, -31, 1, -30]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HqsI8IdsEeOi95YnkGlwiQ" id="(0.8301886792452831,0.47058823529411764)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HqsI8YdsEeOi95YnkGlwiQ" id="(0.10880829015544041,0.45588235294117646)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ORNJ8IdsEeOi95YnkGlwiQ" type="3003" source="_MMNMUIdsEeOi95YnkGlwiQ" target="_FZx2QIdsEeOi95YnkGlwiQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ORNJ8YdsEeOi95YnkGlwiQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ORNJ8odsEeOi95YnkGlwiQ" fontName="Segoe UI"/>

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

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ORNJ84dsEeOi95YnkGlwiQ" points="[-4, -6, 67, 107]$[-4, -46, 67, 67]$[-66, -46, 5, 67]$[-66, -80, 5, 33]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ORW68IdsEeOi95YnkGlwiQ" id="(0.5686274509803921,0.16279069767441862)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_P20c4IdsEeOi95YnkGlwiQ" type="3002" source="_MMNMUIdsEeOi95YnkGlwiQ" target="_FZx2QIdsEeOi95YnkGlwiQ">

-    <children xmi:type="notation:Node" xmi:id="_P20c5IdsEeOi95YnkGlwiQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_P20c5YdsEeOi95YnkGlwiQ" x="16" y="-13"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_P20c5odsEeOi95YnkGlwiQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_P20c54dsEeOi95YnkGlwiQ" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_P20c4YdsEeOi95YnkGlwiQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_P20c4odsEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="ApplyStereotypeActionConfiguration.ecore#//ListValue/values"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P20c44dsEeOi95YnkGlwiQ" points="[50, 0, 44, 140]$[135, 0, 129, 140]$[135, -130, 129, 10]$[31, -130, 25, 10]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P29m0IdsEeOi95YnkGlwiQ" id="(0.8704663212435233,0.3088235294117647)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_UZhMAIdsEeOi95YnkGlwiQ" type="3003" source="_TDFkkIdsEeOi95YnkGlwiQ" target="_FZx2QIdsEeOi95YnkGlwiQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_UZhMAYdsEeOi95YnkGlwiQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_UZhMAodsEeOi95YnkGlwiQ" fontName="Segoe UI"/>

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

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UZhMA4dsEeOi95YnkGlwiQ" points="[39, -20, -125, 102]$[39, -55, -125, 67]$[169, -55, 5, 67]$[169, -89, 5, 33]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_W6pE8IdsEeOi95YnkGlwiQ" type="3002" source="_TDFkkIdsEeOi95YnkGlwiQ" target="_zF9goIdrEeOi95YnkGlwiQ">

-    <children xmi:type="notation:Node" xmi:id="_W6pE9IdsEeOi95YnkGlwiQ" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_W6pE9YdsEeOi95YnkGlwiQ" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_W6pE9odsEeOi95YnkGlwiQ" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_W6pE94dsEeOi95YnkGlwiQ" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_W6pE8YdsEeOi95YnkGlwiQ" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_W6pE8odsEeOi95YnkGlwiQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="ApplyStereotypeActionConfiguration.ecore#//ConstantValue/valueInstance"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W6pE84dsEeOi95YnkGlwiQ" points="[6, 21, 2, -140]$[6, 140, 2, -21]"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W6pE-IdsEeOi95YnkGlwiQ" id="(0.6282051282051282,0.12941176470588237)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_bQjVQIdsEeOi95YnkGlwiQ" type="3003" source="_Y_f4oIdsEeOi95YnkGlwiQ" target="_FZx2QIdsEeOi95YnkGlwiQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_bQjVQYdsEeOi95YnkGlwiQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_bQjVQodsEeOi95YnkGlwiQ" fontName="Segoe UI"/>

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

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bQjVQ4dsEeOi95YnkGlwiQ" points="[-86, -8, -435, 102]$[-86, -43, -435, 67]$[354, -43, 5, 67]$[354, -77, 5, 33]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bQjVRIdsEeOi95YnkGlwiQ" id="(0.8316831683168316,0.19148936170212766)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_fJmqcIdsEeOi95YnkGlwiQ" type="3003" source="_dH4DQIdsEeOi95YnkGlwiQ" target="_Y_f4oIdsEeOi95YnkGlwiQ">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_fJmqcYdsEeOi95YnkGlwiQ" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_fJmqcodsEeOi95YnkGlwiQ" fontName="Segoe UI"/>

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

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fJmqc4dsEeOi95YnkGlwiQ" points="[15, -20, -15, 133]$[15, -130, -15, 23]"/>

-  </edges>

-</notation:Diagram>

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/ApplyStereotypeActionConfiguration.genmodel b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/ApplyStereotypeActionConfiguration.genmodel
deleted file mode 100644
index feca27a51ca..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/ApplyStereotypeActionConfiguration.genmodel
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen" editDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.edit/src-gen"
-    editorDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.uml.tools.extendedtypes" modelName="ApplyStereotypeActionConfiguration"
-    modelPluginClass="" testsDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.tests/src-gen"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
-  <foreignModel>ApplyStereotypeActionConfiguration.ecore</foreignModel>
-  <genPackages prefix="ApplyStereotypeActionConfiguration" basePackage="org.eclipse.papyrus.uml.tools.extendedtypes"
-      resource="XML" disposableProviderFactory="true" ecorePackage="ApplyStereotypeActionConfiguration.ecore#/">
-    <genClasses ecoreClass="ApplyStereotypeActionConfiguration.ecore#//ApplyStereotypeActionConfiguration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeActionConfiguration.ecore#//ApplyStereotypeActionConfiguration/stereotypesToApply"/>
-    </genClasses>
-    <genClasses ecoreClass="ApplyStereotypeActionConfiguration.ecore#//StereotypeToApply">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeActionConfiguration.ecore#//StereotypeToApply/stereotypeQualifiedName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeActionConfiguration.ecore#//StereotypeToApply/updateName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeActionConfiguration.ecore#//StereotypeToApply/requiredProfiles"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeActionConfiguration.ecore#//StereotypeToApply/featuresToSet"/>
-    </genClasses>
-    <genClasses ecoreClass="ApplyStereotypeActionConfiguration.ecore#//FeatureToSet">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeActionConfiguration.ecore#//FeatureToSet/featureName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeActionConfiguration.ecore#//FeatureToSet/value"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="ApplyStereotypeActionConfiguration.ecore#//FeatureValue"/>
-    <genClasses ecoreClass="ApplyStereotypeActionConfiguration.ecore#//ListValue">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ApplyStereotypeActionConfiguration.ecore#//ListValue/values"/>
-    </genClasses>
-    <genClasses ecoreClass="ApplyStereotypeActionConfiguration.ecore#//ConstantValue">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeActionConfiguration.ecore#//ConstantValue/valueInstance"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="ApplyStereotypeActionConfiguration.ecore#//DynamicValue"/>
-    <genClasses ecoreClass="ApplyStereotypeActionConfiguration.ecore#//QueryExecutionValue"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/InvariantStereotypeConfiguration.ecore b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/InvariantStereotypeConfiguration.ecore
deleted file mode 100644
index 5a2d4a135c6..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/InvariantStereotypeConfiguration.ecore
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="invariantstereotypeconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/stereotype/1.0"
-    nsPrefix="invariantstereotypeconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="InvariantStereotypeConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecore#//InvariantRuleConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeQualifiedName"
-        lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredProfile" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strict" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/InvariantStereotypeConfiguration.ecorediag b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/InvariantStereotypeConfiguration.ecorediag
deleted file mode 100644
index 70274fef3c2..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/InvariantStereotypeConfiguration.ecorediag
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram 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" xmi:id="_oukREFguEeOZc_L6ctfnzA" type="EcoreTools" name="InvariantStereotypeConfiguration" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_4F8qwFguEeOZc_L6ctfnzA" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_4F_uEFguEeOZc_L6ctfnzA" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_4GAVIFguEeOZc_L6ctfnzA" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_8KMjUFguEeOZc_L6ctfnzA" type="2001">
-        <element xmi:type="ecore:EAttribute" href="InvariantStereotypeConfiguration.ecore#//InvariantStereotypeConfiguration/stereotypeQualifiedName"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8KMjUVguEeOZc_L6ctfnzA"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_VdH5YGQSEeOl5OaKZvi8pw" type="2001">
-        <element xmi:type="ecore:EAttribute" href="InvariantStereotypeConfiguration.ecore#//InvariantStereotypeConfiguration/requiredProfile"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VdH5YWQSEeOl5OaKZvi8pw"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_4GAVIVguEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_4GAVIlguEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_4GAVI1guEeOZc_L6ctfnzA"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_4GA8MFguEeOZc_L6ctfnzA" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_4GA8MVguEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_4GA8MlguEeOZc_L6ctfnzA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_4GA8M1guEeOZc_L6ctfnzA"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_4F8qwVguEeOZc_L6ctfnzA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="InvariantStereotypeConfiguration.ecore#//InvariantStereotypeConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4F8qwlguEeOZc_L6ctfnzA" x="260" y="355" width="281" height="121"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_4a9FYGM6EeOMru3CBHS08Q" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4fcj0GM6EeOMru3CBHS08Q" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4fcj0WM6EeOMru3CBHS08Q" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_4bAIsGM6EeOMru3CBHS08Q" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_4bAvwGM6EeOMru3CBHS08Q" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_4bAvwWM6EeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_4bAvwmM6EeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_4bAvw2M6EeOMru3CBHS08Q"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_4bBW0GM6EeOMru3CBHS08Q" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_4bBW0WM6EeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_4bBW0mM6EeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_4bBW02M6EeOMru3CBHS08Q"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_4a9FYWM6EeOMru3CBHS08Q" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.ecore#//InvariantRuleConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4a9FYmM6EeOMru3CBHS08Q" x="260" y="130" width="283"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_oukREVguEeOZc_L6ctfnzA"/>
-  <element xmi:type="ecore:EPackage" href="InvariantStereotypeConfiguration.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_6U9T8GM6EeOMru3CBHS08Q" type="3003" source="_4F8qwFguEeOZc_L6ctfnzA" target="_4a9FYGM6EeOMru3CBHS08Q">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_6U9T8WM6EeOMru3CBHS08Q" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_6U9T8mM6EeOMru3CBHS08Q" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6U9T82M6EeOMru3CBHS08Q" points="[18, -13, -15, 196]$[18, -180, -15, 29]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6VAXQGM6EeOMru3CBHS08Q" id="(0.38434163701067614,0.11570247933884298)"/>
-  </edges>
-</notation:Diagram>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/InvariantStereotypeConfiguration.genmodel b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/InvariantStereotypeConfiguration.genmodel
deleted file mode 100644
index 29df9b5d40e..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/InvariantStereotypeConfiguration.genmodel
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen" editDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.edit/src-gen"
-    editorDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.uml.tools.extendedtypes" modelName="InvariantStereotypeConfiguration"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
-    testsDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes ../../org.eclipse.papyrus.infra.extendedtypes/model/InvariantSemanticTypeConfiguration.genmodel#//invariantsemantictypeconfiguration"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>InvariantStereotypeConfiguration.ecore</foreignModel>
-  <genPackages prefix="InvariantStereotypeConfiguration" basePackage="org.eclipse.papyrus.uml.tools.extendedtypes"
-      resource="XML" disposableProviderFactory="true" ecorePackage="InvariantStereotypeConfiguration.ecore#/">
-    <genClasses ecoreClass="InvariantStereotypeConfiguration.ecore#//InvariantStereotypeConfiguration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantStereotypeConfiguration.ecore#//InvariantStereotypeConfiguration/stereotypeQualifiedName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantStereotypeConfiguration.ecore#//InvariantStereotypeConfiguration/requiredProfile"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/SetTypeActionConfiguration.ecore b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/SetTypeActionConfiguration.ecore
deleted file mode 100644
index 2540c266ab7..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/SetTypeActionConfiguration.ecore
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage 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" name="settypeactionconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/settypeaction/1.0"

-    nsPrefix="settypeactionconfiguration">

-  <eClassifiers xsi:type="ecore:EClass" name="SetTypeActionConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="validTypes" upperBound="-1"

-        eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationTypes" upperBound="-1"

-        eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-  </eClassifiers>

-</ecore:EPackage>

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/SetTypeActionConfiguration.ecorediag b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/SetTypeActionConfiguration.ecorediag
deleted file mode 100644
index 3603f6ef5bf..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/SetTypeActionConfiguration.ecorediag
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram 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" xmi:id="_EDs_0JSAEeO-cos6HUbWSw" type="EcoreTools" name="SetTypeActionConfiguration.ecorediag" measurementUnit="Pixel">

-  <children xmi:type="notation:Node" xmi:id="_EEtFYJSAEeO-cos6HUbWSw" type="1001">

-    <children xmi:type="notation:Node" xmi:id="_EFAAUJSAEeO-cos6HUbWSw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_EFERwJSAEeO-cos6HUbWSw" type="5001">

-      <children xmi:type="notation:Node" xmi:id="_IQAoMJSAEeO-cos6HUbWSw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="SetTypeActionConfiguration.ecore#//SetTypeActionConfiguration/validTypes"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IQAoMZSAEeO-cos6HUbWSw"/>

-      </children>

-      <children xmi:type="notation:Node" xmi:id="_KPiP8JSAEeO-cos6HUbWSw" type="2001">

-        <element xmi:type="ecore:EAttribute" href="SetTypeActionConfiguration.ecore#//SetTypeActionConfiguration/creationTypes"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KPiP8ZSAEeO-cos6HUbWSw"/>

-      </children>

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EFERwZSAEeO-cos6HUbWSw"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EFE40JSAEeO-cos6HUbWSw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_EFE40ZSAEeO-cos6HUbWSw"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_EEtFYZSAEeO-cos6HUbWSw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="SetTypeActionConfiguration.ecore#//SetTypeActionConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EEtFYpSAEeO-cos6HUbWSw" x="300" y="395" height="158"/>

-  </children>

-  <children xmi:type="notation:Node" xmi:id="_F1JvUJSAEeO-cos6HUbWSw" type="1001">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_F2ucoJSAEeO-cos6HUbWSw" source="Shortcut">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_F2ucoZSAEeO-cos6HUbWSw" key="modelID" value="EcoreTools"/>

-    </eAnnotations>

-    <children xmi:type="notation:Node" xmi:id="_F1K9cJSAEeO-cos6HUbWSw" type="4001"/>

-    <children xmi:type="notation:Node" xmi:id="_F1LkgJSAEeO-cos6HUbWSw" type="5001">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_F1LkgZSAEeO-cos6HUbWSw"/>

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

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

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_F1MyoJSAEeO-cos6HUbWSw" type="5002">

-      <styles xmi:type="notation:DrawerStyle" xmi:id="_F1MyoZSAEeO-cos6HUbWSw"/>

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

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

-    </children>

-    <styles xmi:type="notation:ShapeStyle" xmi:id="_F1JvUZSAEeO-cos6HUbWSw" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="12560536" lineColor="8421504"/>

-    <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//SemanticActionConfiguration"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F1JvUpSAEeO-cos6HUbWSw" x="300" y="265"/>

-  </children>

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

-  <element xmi:type="ecore:EPackage" href="SetTypeActionConfiguration.ecore#/"/>

-  <edges xmi:type="notation:Edge" xmi:id="_F11EwJSAEeO-cos6HUbWSw" type="3003" source="_EEtFYJSAEeO-cos6HUbWSw" target="_F1JvUJSAEeO-cos6HUbWSw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_F11r0JSAEeO-cos6HUbWSw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_F11r0ZSAEeO-cos6HUbWSw" fontName="Segoe UI"/>

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

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_F11r0pSAEeO-cos6HUbWSw" points="[0, -20, -2, 101]$[0, -92, -2, 29]"/>

-  </edges>

-</notation:Diagram>

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/SetTypeActionConfiguration.genmodel b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/SetTypeActionConfiguration.genmodel
deleted file mode 100644
index 20e99726e8a..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/SetTypeActionConfiguration.genmodel
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

-    modelDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen" editDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.edit/src-gen"

-    editorDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.uml.tools.extendedtypes" modelName="SetTypeActionConfiguration"

-    modelPluginClass="" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    testsDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"

-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes"

-    operationReflection="true" importOrganizing="true">

-  <foreignModel>SetTypeActionConfiguration.ecore</foreignModel>

-  <genPackages prefix="SetTypeActionConfiguration" basePackage="org.eclipse.papyrus.uml.tools.extendedtypes"

-      disposableProviderFactory="true" ecorePackage="SetTypeActionConfiguration.ecore#/">

-    <genClasses ecoreClass="SetTypeActionConfiguration.ecore#//SetTypeActionConfiguration">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetTypeActionConfiguration.ecore#//SetTypeActionConfiguration/validTypes"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetTypeActionConfiguration.ecore#//SetTypeActionConfiguration/creationTypes"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/StereotypedElementMatcherConfiguration.ecore b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/StereotypedElementMatcherConfiguration.ecore
deleted file mode 100644
index 4a9e6b712da..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/StereotypedElementMatcherConfiguration.ecore
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage 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" name="stereotypedelementmatcherconfiguration" nsURI="http://www.eclipse.org/payrus/extendedtypes/uml/stereotypematcherconfiguration"
-    nsPrefix="stereotypedelementmatcherconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="StereotypedElementMatcherConfiguration"
-      eSuperTypes="../../org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//MatcherConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypedQualifiedName"
-        eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/StereotypedElementMatcherConfiguration.ecorediag b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/StereotypedElementMatcherConfiguration.ecorediag
deleted file mode 100644
index 978ec4aab49..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/StereotypedElementMatcherConfiguration.ecorediag
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram 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" xmi:id="_v2jsUGNDEeOMru3CBHS08Q" type="EcoreTools" name="StereotypedElementMatcherConfiguration.ecorediag" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_v2nWsGNDEeOMru3CBHS08Q" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_v2nWs2NDEeOMru3CBHS08Q" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_v2n9wGNDEeOMru3CBHS08Q" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_v2py8GNDEeOMru3CBHS08Q" type="2001">
-        <element xmi:type="ecore:EAttribute" href="StereotypedElementMatcherConfiguration.ecore#//StereotypedElementMatcherConfiguration/stereotypedQualifiedName"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_v2py8WNDEeOMru3CBHS08Q"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_v2n9wWNDEeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_v2n9wmNDEeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_v2n9w2NDEeOMru3CBHS08Q"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_v2n9xGNDEeOMru3CBHS08Q" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_v2n9xWNDEeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_v2n9xmNDEeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_v2n9x2NDEeOMru3CBHS08Q"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_v2nWsWNDEeOMru3CBHS08Q" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="StereotypedElementMatcherConfiguration.ecore#//StereotypedElementMatcherConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v2nWsmNDEeOMru3CBHS08Q" x="185" y="360"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_xyKdYGNDEeOMru3CBHS08Q" type="1001">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xz90MGNDEeOMru3CBHS08Q" source="Shortcut">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xz90MWNDEeOMru3CBHS08Q" key="modelID" value="EcoreTools"/>
-    </eAnnotations>
-    <children xmi:type="notation:Node" xmi:id="_xyLEcGNDEeOMru3CBHS08Q" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_xyLEcWNDEeOMru3CBHS08Q" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xyLEcmNDEeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xyLEc2NDEeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xyLEdGNDEeOMru3CBHS08Q"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_xyLrgGNDEeOMru3CBHS08Q" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_xyLrgWNDEeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_xyLrgmNDEeOMru3CBHS08Q"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_xyLrg2NDEeOMru3CBHS08Q"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_xyKdYWNDEeOMru3CBHS08Q" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//MatcherConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xyKdYmNDEeOMru3CBHS08Q" x="225" y="155" width="188"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_v2jsUWNDEeOMru3CBHS08Q"/>
-  <element xmi:type="ecore:EPackage" href="StereotypedElementMatcherConfiguration.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_xzaakGNDEeOMru3CBHS08Q" type="3003" source="_v2nWsGNDEeOMru3CBHS08Q" target="_xyKdYGNDEeOMru3CBHS08Q">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xzaakWNDEeOMru3CBHS08Q" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xzaakmNDEeOMru3CBHS08Q" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xzaak2NDEeOMru3CBHS08Q" points="[-2, -24, 0, 154]$[-2, -171, 0, 7]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ypTgwGNDEeOMru3CBHS08Q" id="(0.48404255319148937,0.8833333333333333)"/>
-  </edges>
-</notation:Diagram>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/StereotypedElementMatcherConfiguration.genmodel b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/StereotypedElementMatcherConfiguration.genmodel
deleted file mode 100644
index 3ff674e4944..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/model/StereotypedElementMatcherConfiguration.genmodel
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen" editDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.edit/src-gen"
-    editorDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.uml.tools.extendedtypes" modelName="StereotypedElementMatcherConfiguration"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.uml.tools.extendedtypes.tests/src-gen"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>StereotypedElementMatcherConfiguration.ecore</foreignModel>
-  <genPackages prefix="StereotypedElementMatcherConfiguration" basePackage="org.eclipse.papyrus.uml.tools.extendedtypes"
-      resource="XML" disposableProviderFactory="true" ecorePackage="StereotypedElementMatcherConfiguration.ecore#/">
-    <genClasses ecoreClass="StereotypedElementMatcherConfiguration.ecore#//StereotypedElementMatcherConfiguration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute StereotypedElementMatcherConfiguration.ecore#//StereotypedElementMatcherConfiguration/stereotypedQualifiedName"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/plugin.properties b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/plugin.properties
deleted file mode 100644
index 971dd44a0dc..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################################################

-# Copyright (c) 2010 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 = UML configurations for Extended Types framework

-providerName = Eclipse Modeling Project

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/plugin.xml b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/plugin.xml
deleted file mode 100644
index 5deec45fe83..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/plugin.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated StereotypedElementMatcherConfiguration -->
-      <package
-            uri="http://www.eclipse.org/payrus/extendedtypes/uml/stereotypematcherconfiguration"
-            class="org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage"
-            genModel="model/StereotypedElementMatcherConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated StereotypedElementMatcherConfiguration -->
-      <parser
-            type="stereotypedelementmatcherconfiguration"
-            class="org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.util.StereotypedElementMatcherConfigurationResourceFactoryImpl"/>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated InvariantStereotypeConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/stereotype/1.0"
-            class="org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage"
-            genModel="model/InvariantStereotypeConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated InvariantStereotypeConfiguration -->
-      <parser
-            type="invariantstereotypeconfiguration"
-            class="org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.util.InvariantStereotypeConfigurationResourceFactoryImpl"/>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated ApplyStereotypeActionConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0"
-            class="org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage"
-            genModel="model/ApplyStereotypeActionConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated ApplyStereotypeActionConfiguration -->
-      <parser
-            type="applystereotypeactionconfiguration"
-            class="org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util.ApplyStereotypeActionConfigurationResourceFactoryImpl"/>
-   </extension>
-    <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated SetTypeActionConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/extendedtypes/uml/settypeaction/1.0"
-            class="org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage"
-            genModel="model/SetTypeActionConfiguration.genmodel"/>
-   </extension> 
-
-   <!-- CUSTOM EXTENSIONS -->
-   <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.aspectActionConfiguration">
-      <aspectAction
-            configurationClass="org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration"
-            configurationModelCreation="org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationModelCreation"
-            creationElementValidator="org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionCreationElementValidator"
-            editHelperAdvice="org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionEditHelperAdvice">
-      </aspectAction>
-   </extension>
-      <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.invariantRule">
-      <invariantRule
-            configurationClass="org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration"
-            configurationModelCreation="org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationModelCreation"
-            editHelperAdvice="org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeEditHelperAdvice"
-            elementMatcher="org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeElementMatcher">
-      </invariantRule>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.extendedtypes.elementMatcherConfiguration">
-      <configuration
-            configurationClass="org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration"
-            configurationModelCreation="org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherModelCreation"
-            factoryClass="org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherFactory"
-            name="StereotypedElementMatcher">
-      </configuration>
-   </extension>
-</plugin>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/pom.xml b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/pom.xml
deleted file mode 100644
index 559eb9b5e26..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-tools</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.tools.extendedtypes</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfiguration.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfiguration.java
deleted file mode 100644
index 0c3c62ea2a7..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfiguration.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Apply Stereotype Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration#getStereotypesToApply <em>Stereotypes To Apply</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getApplyStereotypeActionConfiguration()

- * @model

- * @generated

- */

-public interface ApplyStereotypeActionConfiguration extends SemanticActionConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Stereotypes To Apply</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Stereotypes To Apply</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Stereotypes To Apply</em>' containment reference list.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getApplyStereotypeActionConfiguration_StereotypesToApply()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<StereotypeToApply> getStereotypesToApply();

-

-} // ApplyStereotypeActionConfiguration

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationFactory.java
deleted file mode 100644
index 8ab11ac0df9..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationFactory.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage

- * @generated

- */

-public interface ApplyStereotypeActionConfigurationFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ApplyStereotypeActionConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Apply Stereotype Action Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Apply Stereotype Action Configuration</em>'.

-	 * @generated

-	 */

-	ApplyStereotypeActionConfiguration createApplyStereotypeActionConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Stereotype To Apply</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Stereotype To Apply</em>'.

-	 * @generated

-	 */

-	StereotypeToApply createStereotypeToApply();

-

-	/**

-	 * Returns a new object of class '<em>Feature To Set</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Feature To Set</em>'.

-	 * @generated

-	 */

-	FeatureToSet createFeatureToSet();

-

-	/**

-	 * Returns a new object of class '<em>List Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>List Value</em>'.

-	 * @generated

-	 */

-	ListValue createListValue();

-

-	/**

-	 * Returns a new object of class '<em>Constant Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Constant Value</em>'.

-	 * @generated

-	 */

-	ConstantValue createConstantValue();

-

-	/**

-	 * Returns a new object of class '<em>Query Execution Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Query Execution Value</em>'.

-	 * @generated

-	 */

-	QueryExecutionValue createQueryExecutionValue();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	ApplyStereotypeActionConfigurationPackage getApplyStereotypeActionConfigurationPackage();

-

-} // ApplyStereotypeActionConfigurationFactory

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationPackage.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationPackage.java
deleted file mode 100644
index 1360bcd03fc..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationPackage.java
+++ /dev/null
@@ -1,764 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

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

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationFactory

- * @model kind="package"

- * @generated

- */

-public interface ApplyStereotypeActionConfigurationPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "applystereotypeactionconfiguration";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/uml/applystereotypeaction/1.0";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "applystereotypeactionconfiguration";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	ApplyStereotypeActionConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationImpl <em>Apply Stereotype Action Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationImpl

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getApplyStereotypeActionConfiguration()

-	 * @generated

-	 */

-	int APPLY_STEREOTYPE_ACTION_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int APPLY_STEREOTYPE_ACTION_CONFIGURATION__NAME = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int APPLY_STEREOTYPE_ACTION_CONFIGURATION__DESCRIPTION = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int APPLY_STEREOTYPE_ACTION_CONFIGURATION__IDENTIFIER = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int APPLY_STEREOTYPE_ACTION_CONFIGURATION__ICON_ENTRY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Stereotypes To Apply</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int APPLY_STEREOTYPE_ACTION_CONFIGURATION__STEREOTYPES_TO_APPLY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Apply Stereotype Action Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int APPLY_STEREOTYPE_ACTION_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.StereotypeToApplyImpl <em>Stereotype To Apply</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.StereotypeToApplyImpl

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getStereotypeToApply()

-	 * @generated

-	 */

-	int STEREOTYPE_TO_APPLY = 1;

-

-	/**

-	 * The feature id for the '<em><b>Stereotype Qualified Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME = 0;

-

-	/**

-	 * The feature id for the '<em><b>Update Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPE_TO_APPLY__UPDATE_NAME = 1;

-

-	/**

-	 * The feature id for the '<em><b>Required Profiles</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPE_TO_APPLY__REQUIRED_PROFILES = 2;

-

-	/**

-	 * The feature id for the '<em><b>Features To Set</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPE_TO_APPLY__FEATURES_TO_SET = 3;

-

-	/**

-	 * The number of structural features of the '<em>Stereotype To Apply</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPE_TO_APPLY_FEATURE_COUNT = 4;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.FeatureToSetImpl

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getFeatureToSet()

-	 * @generated

-	 */

-	int FEATURE_TO_SET = 2;

-

-	/**

-	 * The feature id for the '<em><b>Feature Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TO_SET__FEATURE_NAME = 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TO_SET__VALUE = 1;

-

-	/**

-	 * The number of structural features of the '<em>Feature To Set</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_TO_SET_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.FeatureValueImpl

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getFeatureValue()

-	 * @generated

-	 */

-	int FEATURE_VALUE = 3;

-

-	/**

-	 * The number of structural features of the '<em>Feature Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_VALUE_FEATURE_COUNT = 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ListValueImpl

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getListValue()

-	 * @generated

-	 */

-	int LIST_VALUE = 4;

-

-	/**

-	 * The feature id for the '<em><b>Values</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int LIST_VALUE__VALUES = FEATURE_VALUE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>List Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int LIST_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ConstantValueImpl

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getConstantValue()

-	 * @generated

-	 */

-	int CONSTANT_VALUE = 5;

-

-	/**

-	 * The feature id for the '<em><b>Value Instance</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTANT_VALUE__VALUE_INSTANCE = FEATURE_VALUE_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Constant Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int CONSTANT_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.DynamicValueImpl

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getDynamicValue()

-	 * @generated

-	 */

-	int DYNAMIC_VALUE = 6;

-

-	/**

-	 * The number of structural features of the '<em>Dynamic Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int DYNAMIC_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.QueryExecutionValueImpl

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getQueryExecutionValue()

-	 * @generated

-	 */

-	int QUERY_EXECUTION_VALUE = 7;

-

-	/**

-	 * The number of structural features of the '<em>Query Execution Value</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int QUERY_EXECUTION_VALUE_FEATURE_COUNT = DYNAMIC_VALUE_FEATURE_COUNT + 0;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration <em>Apply Stereotype Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Apply Stereotype Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration

-	 * @generated

-	 */

-	EClass getApplyStereotypeActionConfiguration();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration#getStereotypesToApply <em>Stereotypes To Apply</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Stereotypes To Apply</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration#getStereotypesToApply()

-	 * @see #getApplyStereotypeActionConfiguration()

-	 * @generated

-	 */

-	EReference getApplyStereotypeActionConfiguration_StereotypesToApply();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply <em>Stereotype To Apply</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Stereotype To Apply</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply

-	 * @generated

-	 */

-	EClass getStereotypeToApply();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Stereotype Qualified Name</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#getStereotypeQualifiedName()

-	 * @see #getStereotypeToApply()

-	 * @generated

-	 */

-	EAttribute getStereotypeToApply_StereotypeQualifiedName();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Update Name</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#isUpdateName()

-	 * @see #getStereotypeToApply()

-	 * @generated

-	 */

-	EAttribute getStereotypeToApply_UpdateName();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#getRequiredProfiles <em>Required Profiles</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Required Profiles</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#getRequiredProfiles()

-	 * @see #getStereotypeToApply()

-	 * @generated

-	 */

-	EAttribute getStereotypeToApply_RequiredProfiles();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#getFeaturesToSet <em>Features To Set</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Features To Set</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#getFeaturesToSet()

-	 * @see #getStereotypeToApply()

-	 * @generated

-	 */

-	EReference getStereotypeToApply_FeaturesToSet();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet <em>Feature To Set</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Feature To Set</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet

-	 * @generated

-	 */

-	EClass getFeatureToSet();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Feature Name</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet#getFeatureName()

-	 * @see #getFeatureToSet()

-	 * @generated

-	 */

-	EAttribute getFeatureToSet_FeatureName();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet#getValue <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Value</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet#getValue()

-	 * @see #getFeatureToSet()

-	 * @generated

-	 */

-	EReference getFeatureToSet_Value();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue <em>Feature Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Feature Value</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue

-	 * @generated

-	 */

-	EClass getFeatureValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue <em>List Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>List Value</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue

-	 * @generated

-	 */

-	EClass getListValue();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue#getValues <em>Values</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference list '<em>Values</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue#getValues()

-	 * @see #getListValue()

-	 * @generated

-	 */

-	EReference getListValue_Values();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue <em>Constant Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Constant Value</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue

-	 * @generated

-	 */

-	EClass getConstantValue();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the containment reference '<em>Value Instance</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue#getValueInstance()

-	 * @see #getConstantValue()

-	 * @generated

-	 */

-	EReference getConstantValue_ValueInstance();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.DynamicValue <em>Dynamic Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Dynamic Value</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.DynamicValue

-	 * @generated

-	 */

-	EClass getDynamicValue();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Query Execution Value</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue

-	 * @generated

-	 */

-	EClass getQueryExecutionValue();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	ApplyStereotypeActionConfigurationFactory getApplyStereotypeActionConfigurationFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationImpl <em>Apply Stereotype Action Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationImpl

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getApplyStereotypeActionConfiguration()

-		 * @generated

-		 */

-		EClass APPLY_STEREOTYPE_ACTION_CONFIGURATION = eINSTANCE.getApplyStereotypeActionConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Stereotypes To Apply</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference APPLY_STEREOTYPE_ACTION_CONFIGURATION__STEREOTYPES_TO_APPLY = eINSTANCE.getApplyStereotypeActionConfiguration_StereotypesToApply();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.StereotypeToApplyImpl <em>Stereotype To Apply</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.StereotypeToApplyImpl

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getStereotypeToApply()

-		 * @generated

-		 */

-		EClass STEREOTYPE_TO_APPLY = eINSTANCE.getStereotypeToApply();

-

-		/**

-		 * The meta object literal for the '<em><b>Stereotype Qualified Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME = eINSTANCE.getStereotypeToApply_StereotypeQualifiedName();

-

-		/**

-		 * The meta object literal for the '<em><b>Update Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute STEREOTYPE_TO_APPLY__UPDATE_NAME = eINSTANCE.getStereotypeToApply_UpdateName();

-

-		/**

-		 * The meta object literal for the '<em><b>Required Profiles</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute STEREOTYPE_TO_APPLY__REQUIRED_PROFILES = eINSTANCE.getStereotypeToApply_RequiredProfiles();

-

-		/**

-		 * The meta object literal for the '<em><b>Features To Set</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference STEREOTYPE_TO_APPLY__FEATURES_TO_SET = eINSTANCE.getStereotypeToApply_FeaturesToSet();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.FeatureToSetImpl

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getFeatureToSet()

-		 * @generated

-		 */

-		EClass FEATURE_TO_SET = eINSTANCE.getFeatureToSet();

-

-		/**

-		 * The meta object literal for the '<em><b>Feature Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute FEATURE_TO_SET__FEATURE_NAME = eINSTANCE.getFeatureToSet_FeatureName();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference FEATURE_TO_SET__VALUE = eINSTANCE.getFeatureToSet_Value();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.FeatureValueImpl

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getFeatureValue()

-		 * @generated

-		 */

-		EClass FEATURE_VALUE = eINSTANCE.getFeatureValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ListValueImpl <em>List Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ListValueImpl

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getListValue()

-		 * @generated

-		 */

-		EClass LIST_VALUE = eINSTANCE.getListValue();

-

-		/**

-		 * The meta object literal for the '<em><b>Values</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference LIST_VALUE__VALUES = eINSTANCE.getListValue_Values();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ConstantValueImpl

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getConstantValue()

-		 * @generated

-		 */

-		EClass CONSTANT_VALUE = eINSTANCE.getConstantValue();

-

-		/**

-		 * The meta object literal for the '<em><b>Value Instance</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EReference CONSTANT_VALUE__VALUE_INSTANCE = eINSTANCE.getConstantValue_ValueInstance();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.DynamicValueImpl

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getDynamicValue()

-		 * @generated

-		 */

-		EClass DYNAMIC_VALUE = eINSTANCE.getDynamicValue();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.QueryExecutionValueImpl

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationPackageImpl#getQueryExecutionValue()

-		 * @generated

-		 */

-		EClass QUERY_EXECUTION_VALUE = eINSTANCE.getQueryExecutionValue();

-

-	}

-

-} // ApplyStereotypeActionConfigurationPackage

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ConstantValue.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ConstantValue.java
deleted file mode 100644
index c291f27951e..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ConstantValue.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Constant Value</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getConstantValue()

- * @model

- * @generated

- */

-public interface ConstantValue extends FeatureValue {

-	/**

-	 * Returns the value of the '<em><b>Value Instance</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value Instance</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value Instance</em>' containment reference.

-	 * @see #setValueInstance(ValueSpecification)

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getConstantValue_ValueInstance()

-	 * @model containment="true"

-	 * @generated

-	 */

-	ValueSpecification getValueInstance();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value Instance</em>' containment reference.

-	 * @see #getValueInstance()

-	 * @generated

-	 */

-	void setValueInstance(ValueSpecification value);

-

-} // ConstantValue

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/DynamicValue.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/DynamicValue.java
deleted file mode 100644
index 2ba93134931..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/DynamicValue.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Dynamic Value</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getDynamicValue()

- * @model abstract="true"

- * @generated

- */

-public interface DynamicValue extends FeatureValue {

-} // DynamicValue

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/FeatureToSet.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/FeatureToSet.java
deleted file mode 100644
index 7a1f1efb2eb..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/FeatureToSet.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature To Set</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getFeatureToSet()

- * @model

- * @generated

- */

-public interface FeatureToSet extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Feature Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Feature Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Feature Name</em>' attribute.

-	 * @see #setFeatureName(String)

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getFeatureToSet_FeatureName()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getFeatureName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Feature Name</em>' attribute.

-	 * @see #getFeatureName()

-	 * @generated

-	 */

-	void setFeatureName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' containment reference isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Value</em>' containment reference.

-	 * @see #setValue(FeatureValue)

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getFeatureToSet_Value()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	FeatureValue getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet#getValue <em>Value</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Value</em>' containment reference.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(FeatureValue value);

-

-} // FeatureToSet

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/FeatureValue.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/FeatureValue.java
deleted file mode 100644
index 20b433b8e86..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/FeatureValue.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Value</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getFeatureValue()

- * @model abstract="true"

- * @generated

- */

-public interface FeatureValue extends EObject {

-} // FeatureValue

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ListValue.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ListValue.java
deleted file mode 100644
index c50c373c05f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ListValue.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>List Value</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue#getValues <em>Values</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getListValue()

- * @model

- * @generated

- */

-public interface ListValue extends FeatureValue {

-	/**

-	 * Returns the value of the '<em><b>Values</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Values</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Values</em>' containment reference list.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getListValue_Values()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<FeatureValue> getValues();

-

-} // ListValue

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/QueryExecutionValue.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/QueryExecutionValue.java
deleted file mode 100644
index 9873c4406d7..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/QueryExecutionValue.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Query Execution Value</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getQueryExecutionValue()

- * @model

- * @generated

- */

-public interface QueryExecutionValue extends DynamicValue {

-} // QueryExecutionValue

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeToApply.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeToApply.java
deleted file mode 100644
index f6eddc57d91..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeToApply.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-import org.eclipse.emf.common.util.EList;

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

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Stereotype To Apply</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#getRequiredProfiles <em>Required Profiles</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#getFeaturesToSet <em>Features To Set</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getStereotypeToApply()

- * @model

- * @generated

- */

-public interface StereotypeToApply extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Stereotype Qualified Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Stereotype Qualified Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Stereotype Qualified Name</em>' attribute.

-	 * @see #setStereotypeQualifiedName(String)

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getStereotypeToApply_StereotypeQualifiedName()

-	 * @model

-	 * @generated

-	 */

-	String getStereotypeQualifiedName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Stereotype Qualified Name</em>' attribute.

-	 * @see #getStereotypeQualifiedName()

-	 * @generated

-	 */

-	void setStereotypeQualifiedName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Update Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Update Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Update Name</em>' attribute.

-	 * @see #setUpdateName(boolean)

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getStereotypeToApply_UpdateName()

-	 * @model

-	 * @generated

-	 */

-	boolean isUpdateName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Update Name</em>' attribute.

-	 * @see #isUpdateName()

-	 * @generated

-	 */

-	void setUpdateName(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Required Profiles</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Required Profiles</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Required Profiles</em>' attribute list.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getStereotypeToApply_RequiredProfiles()

-	 * @model required="true"

-	 * @generated

-	 */

-	EList<String> getRequiredProfiles();

-

-	/**

-	 * Returns the value of the '<em><b>Features To Set</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Features To Set</em>' containment reference list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Features To Set</em>' containment reference list.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#getStereotypeToApply_FeaturesToSet()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<FeatureToSet> getFeaturesToSet();

-

-} // StereotypeToApply

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationFactoryImpl.java
deleted file mode 100644
index e988cb8fc1d..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

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

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationFactory;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ApplyStereotypeActionConfigurationFactoryImpl extends EFactoryImpl implements ApplyStereotypeActionConfigurationFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static ApplyStereotypeActionConfigurationFactory init() {

-		try {

-			ApplyStereotypeActionConfigurationFactory theApplyStereotypeActionConfigurationFactory = (ApplyStereotypeActionConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(ApplyStereotypeActionConfigurationPackage.eNS_URI);

-			if (theApplyStereotypeActionConfigurationFactory != null) {

-				return theApplyStereotypeActionConfigurationFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new ApplyStereotypeActionConfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ApplyStereotypeActionConfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case ApplyStereotypeActionConfigurationPackage.APPLY_STEREOTYPE_ACTION_CONFIGURATION:

-			return createApplyStereotypeActionConfiguration();

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY:

-			return createStereotypeToApply();

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET:

-			return createFeatureToSet();

-		case ApplyStereotypeActionConfigurationPackage.LIST_VALUE:

-			return createListValue();

-		case ApplyStereotypeActionConfigurationPackage.CONSTANT_VALUE:

-			return createConstantValue();

-		case ApplyStereotypeActionConfigurationPackage.QUERY_EXECUTION_VALUE:

-			return createQueryExecutionValue();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ApplyStereotypeActionConfiguration createApplyStereotypeActionConfiguration() {

-		ApplyStereotypeActionConfigurationImpl applyStereotypeActionConfiguration = new ApplyStereotypeActionConfigurationImpl();

-		return applyStereotypeActionConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StereotypeToApply createStereotypeToApply() {

-		StereotypeToApplyImpl stereotypeToApply = new StereotypeToApplyImpl();

-		return stereotypeToApply;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FeatureToSet createFeatureToSet() {

-		FeatureToSetImpl featureToSet = new FeatureToSetImpl();

-		return featureToSet;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ListValue createListValue() {

-		ListValueImpl listValue = new ListValueImpl();

-		return listValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ConstantValue createConstantValue() {

-		ConstantValueImpl constantValue = new ConstantValueImpl();

-		return constantValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public QueryExecutionValue createQueryExecutionValue() {

-		QueryExecutionValueImpl queryExecutionValue = new QueryExecutionValueImpl();

-		return queryExecutionValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ApplyStereotypeActionConfigurationPackage getApplyStereotypeActionConfigurationPackage() {

-		return (ApplyStereotypeActionConfigurationPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static ApplyStereotypeActionConfigurationPackage getPackage() {

-		return ApplyStereotypeActionConfigurationPackage.eINSTANCE;

-	}

-

-} // ApplyStereotypeActionConfigurationFactoryImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationImpl.java
deleted file mode 100644
index 437aee11c86..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Apply Stereotype Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ApplyStereotypeActionConfigurationImpl#getStereotypesToApply <em>Stereotypes To Apply</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ApplyStereotypeActionConfigurationImpl extends SemanticActionConfigurationImpl implements ApplyStereotypeActionConfiguration {

-	/**

-	 * The cached value of the '{@link #getStereotypesToApply() <em>Stereotypes To Apply</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getStereotypesToApply()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<StereotypeToApply> stereotypesToApply;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ApplyStereotypeActionConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ApplyStereotypeActionConfigurationPackage.Literals.APPLY_STEREOTYPE_ACTION_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<StereotypeToApply> getStereotypesToApply() {

-		if (stereotypesToApply == null) {

-			stereotypesToApply = new EObjectContainmentEList<StereotypeToApply>(StereotypeToApply.class, this, ApplyStereotypeActionConfigurationPackage.APPLY_STEREOTYPE_ACTION_CONFIGURATION__STEREOTYPES_TO_APPLY);

-		}

-		return stereotypesToApply;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.APPLY_STEREOTYPE_ACTION_CONFIGURATION__STEREOTYPES_TO_APPLY:

-			return ((InternalEList<?>) getStereotypesToApply()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.APPLY_STEREOTYPE_ACTION_CONFIGURATION__STEREOTYPES_TO_APPLY:

-			return getStereotypesToApply();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.APPLY_STEREOTYPE_ACTION_CONFIGURATION__STEREOTYPES_TO_APPLY:

-			getStereotypesToApply().clear();

-			getStereotypesToApply().addAll((Collection<? extends StereotypeToApply>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.APPLY_STEREOTYPE_ACTION_CONFIGURATION__STEREOTYPES_TO_APPLY:

-			getStereotypesToApply().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.APPLY_STEREOTYPE_ACTION_CONFIGURATION__STEREOTYPES_TO_APPLY:

-			return stereotypesToApply != null && !stereotypesToApply.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ApplyStereotypeActionConfigurationImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationPackageImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationPackageImpl.java
deleted file mode 100644
index 9e54f6d73e9..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ApplyStereotypeActionConfigurationPackageImpl.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

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

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationFactory;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.DynamicValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ApplyStereotypeActionConfigurationPackageImpl extends EPackageImpl implements ApplyStereotypeActionConfigurationPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass applyStereotypeActionConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass stereotypeToApplyEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass featureToSetEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass featureValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass listValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass constantValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass dynamicValueEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass queryExecutionValueEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private ApplyStereotypeActionConfigurationPackageImpl() {

-		super(eNS_URI, ApplyStereotypeActionConfigurationFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link ApplyStereotypeActionConfigurationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static ApplyStereotypeActionConfigurationPackage init() {

-		if (isInited) {

-			return (ApplyStereotypeActionConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(ApplyStereotypeActionConfigurationPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		ApplyStereotypeActionConfigurationPackageImpl theApplyStereotypeActionConfigurationPackage = (ApplyStereotypeActionConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ApplyStereotypeActionConfigurationPackageImpl ? EPackage.Registry.INSTANCE

-				.get(eNS_URI) : new ApplyStereotypeActionConfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		ExtendedtypesPackage.eINSTANCE.eClass();

-		UMLPackage.eINSTANCE.eClass();

-

-		// Create package meta-data objects

-		theApplyStereotypeActionConfigurationPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theApplyStereotypeActionConfigurationPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theApplyStereotypeActionConfigurationPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(ApplyStereotypeActionConfigurationPackage.eNS_URI, theApplyStereotypeActionConfigurationPackage);

-		return theApplyStereotypeActionConfigurationPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getApplyStereotypeActionConfiguration() {

-		return applyStereotypeActionConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getApplyStereotypeActionConfiguration_StereotypesToApply() {

-		return (EReference) applyStereotypeActionConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getStereotypeToApply() {

-		return stereotypeToApplyEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getStereotypeToApply_StereotypeQualifiedName() {

-		return (EAttribute) stereotypeToApplyEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getStereotypeToApply_UpdateName() {

-		return (EAttribute) stereotypeToApplyEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getStereotypeToApply_RequiredProfiles() {

-		return (EAttribute) stereotypeToApplyEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getStereotypeToApply_FeaturesToSet() {

-		return (EReference) stereotypeToApplyEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getFeatureToSet() {

-		return featureToSetEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getFeatureToSet_FeatureName() {

-		return (EAttribute) featureToSetEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getFeatureToSet_Value() {

-		return (EReference) featureToSetEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getFeatureValue() {

-		return featureValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getListValue() {

-		return listValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getListValue_Values() {

-		return (EReference) listValueEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getConstantValue() {

-		return constantValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EReference getConstantValue_ValueInstance() {

-		return (EReference) constantValueEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getDynamicValue() {

-		return dynamicValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getQueryExecutionValue() {

-		return queryExecutionValueEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ApplyStereotypeActionConfigurationFactory getApplyStereotypeActionConfigurationFactory() {

-		return (ApplyStereotypeActionConfigurationFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		applyStereotypeActionConfigurationEClass = createEClass(APPLY_STEREOTYPE_ACTION_CONFIGURATION);

-		createEReference(applyStereotypeActionConfigurationEClass, APPLY_STEREOTYPE_ACTION_CONFIGURATION__STEREOTYPES_TO_APPLY);

-

-		stereotypeToApplyEClass = createEClass(STEREOTYPE_TO_APPLY);

-		createEAttribute(stereotypeToApplyEClass, STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME);

-		createEAttribute(stereotypeToApplyEClass, STEREOTYPE_TO_APPLY__UPDATE_NAME);

-		createEAttribute(stereotypeToApplyEClass, STEREOTYPE_TO_APPLY__REQUIRED_PROFILES);

-		createEReference(stereotypeToApplyEClass, STEREOTYPE_TO_APPLY__FEATURES_TO_SET);

-

-		featureToSetEClass = createEClass(FEATURE_TO_SET);

-		createEAttribute(featureToSetEClass, FEATURE_TO_SET__FEATURE_NAME);

-		createEReference(featureToSetEClass, FEATURE_TO_SET__VALUE);

-

-		featureValueEClass = createEClass(FEATURE_VALUE);

-

-		listValueEClass = createEClass(LIST_VALUE);

-		createEReference(listValueEClass, LIST_VALUE__VALUES);

-

-		constantValueEClass = createEClass(CONSTANT_VALUE);

-		createEReference(constantValueEClass, CONSTANT_VALUE__VALUE_INSTANCE);

-

-		dynamicValueEClass = createEClass(DYNAMIC_VALUE);

-

-		queryExecutionValueEClass = createEClass(QUERY_EXECUTION_VALUE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-		UMLPackage theUMLPackage = (UMLPackage) EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		applyStereotypeActionConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getSemanticActionConfiguration());

-		listValueEClass.getESuperTypes().add(this.getFeatureValue());

-		constantValueEClass.getESuperTypes().add(this.getFeatureValue());

-		dynamicValueEClass.getESuperTypes().add(this.getFeatureValue());

-		queryExecutionValueEClass.getESuperTypes().add(this.getDynamicValue());

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(applyStereotypeActionConfigurationEClass, ApplyStereotypeActionConfiguration.class, "ApplyStereotypeActionConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getApplyStereotypeActionConfiguration_StereotypesToApply(), this.getStereotypeToApply(), null, "stereotypesToApply", null, 0, -1, ApplyStereotypeActionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,

-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(stereotypeToApplyEClass, StereotypeToApply.class, "StereotypeToApply", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getStereotypeToApply_StereotypeQualifiedName(), ecorePackage.getEString(), "stereotypeQualifiedName", null, 0, 1, StereotypeToApply.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEAttribute(getStereotypeToApply_UpdateName(), ecorePackage.getEBoolean(), "updateName", null, 0, 1, StereotypeToApply.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getStereotypeToApply_RequiredProfiles(), theEcorePackage.getEString(), "requiredProfiles", null, 1, -1, StereotypeToApply.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getStereotypeToApply_FeaturesToSet(), this.getFeatureToSet(), null, "featuresToSet", null, 0, -1, StereotypeToApply.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-

-		initEClass(featureToSetEClass, FeatureToSet.class, "FeatureToSet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getFeatureToSet_FeatureName(), ecorePackage.getEString(), "featureName", null, 1, 1, FeatureToSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getFeatureToSet_Value(), this.getFeatureValue(), null, "value", null, 1, 1, FeatureToSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(featureValueEClass, FeatureValue.class, "FeatureValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(listValueEClass, ListValue.class, "ListValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getListValue_Values(), this.getFeatureValue(), null, "values", null, 0, -1, ListValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(constantValueEClass, ConstantValue.class, "ConstantValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getConstantValue_ValueInstance(), theUMLPackage.getValueSpecification(), null, "valueInstance", null, 0, 1, ConstantValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,

-				!IS_DERIVED, IS_ORDERED);

-

-		initEClass(dynamicValueEClass, DynamicValue.class, "DynamicValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(queryExecutionValueEClass, QueryExecutionValue.class, "QueryExecutionValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // ApplyStereotypeActionConfigurationPackageImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ConstantValueImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ConstantValueImpl.java
deleted file mode 100644
index 62b9eea3281..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ConstantValueImpl.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Constant Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue {

-	/**

-	 * The cached value of the '{@link #getValueInstance() <em>Value Instance</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValueInstance()

-	 * @generated

-	 * @ordered

-	 */

-	protected ValueSpecification valueInstance;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ConstantValueImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ApplyStereotypeActionConfigurationPackage.Literals.CONSTANT_VALUE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ValueSpecification getValueInstance() {

-		return valueInstance;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetValueInstance(ValueSpecification newValueInstance, NotificationChain msgs) {

-		ValueSpecification oldValueInstance = valueInstance;

-		valueInstance = newValueInstance;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ApplyStereotypeActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, oldValueInstance, newValueInstance);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setValueInstance(ValueSpecification newValueInstance) {

-		if (newValueInstance != valueInstance) {

-			NotificationChain msgs = null;

-			if (valueInstance != null) {

-				msgs = ((InternalEObject) valueInstance).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);

-			}

-			if (newValueInstance != null) {

-				msgs = ((InternalEObject) newValueInstance).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);

-			}

-			msgs = basicSetValueInstance(newValueInstance, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, newValueInstance, newValueInstance));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:

-			return basicSetValueInstance(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:

-			return getValueInstance();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:

-			setValueInstance((ValueSpecification) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:

-			setValueInstance((ValueSpecification) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:

-			return valueInstance != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ConstantValueImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/DynamicValueImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/DynamicValueImpl.java
deleted file mode 100644
index 2cbd34639be..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/DynamicValueImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.DynamicValue;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Dynamic Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class DynamicValueImpl extends FeatureValueImpl implements DynamicValue {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected DynamicValueImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ApplyStereotypeActionConfigurationPackage.Literals.DYNAMIC_VALUE;

-	}

-

-} // DynamicValueImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureToSetImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureToSetImpl.java
deleted file mode 100644
index c18b4d31b69..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureToSetImpl.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature To Set</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {

-	/**

-	 * The default value of the '{@link #getFeatureName() <em>Feature Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getFeatureName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String FEATURE_NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getFeatureName() <em>Feature Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getFeatureName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String featureName = FEATURE_NAME_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected FeatureValue value;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FeatureToSetImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ApplyStereotypeActionConfigurationPackage.Literals.FEATURE_TO_SET;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getFeatureName() {

-		return featureName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setFeatureName(String newFeatureName) {

-		String oldFeatureName = featureName;

-		featureName = newFeatureName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME, oldFeatureName, featureName));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public FeatureValue getValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public NotificationChain basicSetValue(FeatureValue newValue, NotificationChain msgs) {

-		FeatureValue oldValue = value;

-		value = newValue;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__VALUE, oldValue, newValue);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setValue(FeatureValue newValue) {

-		if (newValue != value) {

-			NotificationChain msgs = null;

-			if (value != null) {

-				msgs = ((InternalEObject) value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);

-			}

-			if (newValue != null) {

-				msgs = ((InternalEObject) newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);

-			}

-			msgs = basicSetValue(newValue, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__VALUE, newValue, newValue));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__VALUE:

-			return basicSetValue(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:

-			return getFeatureName();

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__VALUE:

-			return getValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:

-			setFeatureName((String) newValue);

-			return;

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__VALUE:

-			setValue((FeatureValue) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:

-			setFeatureName(FEATURE_NAME_EDEFAULT);

-			return;

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__VALUE:

-			setValue((FeatureValue) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:

-			return FEATURE_NAME_EDEFAULT == null ? featureName != null : !FEATURE_NAME_EDEFAULT.equals(featureName);

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET__VALUE:

-			return value != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (featureName: ");

-		result.append(featureName);

-		result.append(')');

-		return result.toString();

-	}

-

-} // FeatureToSetImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureValueImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureValueImpl.java
deleted file mode 100644
index 52a199ddfdb..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/FeatureValueImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public abstract class FeatureValueImpl extends EObjectImpl implements FeatureValue {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected FeatureValueImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ApplyStereotypeActionConfigurationPackage.Literals.FEATURE_VALUE;

-	}

-

-} // FeatureValueImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ListValueImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ListValueImpl.java
deleted file mode 100644
index ace9ce20861..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/ListValueImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>List Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.ListValueImpl#getValues <em>Values</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ListValueImpl extends FeatureValueImpl implements ListValue {

-	/**

-	 * The cached value of the '{@link #getValues() <em>Values</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValues()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<FeatureValue> values;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ListValueImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ApplyStereotypeActionConfigurationPackage.Literals.LIST_VALUE;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<FeatureValue> getValues() {

-		if (values == null) {

-			values = new EObjectContainmentEList<FeatureValue>(FeatureValue.class, this, ApplyStereotypeActionConfigurationPackage.LIST_VALUE__VALUES);

-		}

-		return values;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.LIST_VALUE__VALUES:

-			return ((InternalEList<?>) getValues()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.LIST_VALUE__VALUES:

-			return getValues();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.LIST_VALUE__VALUES:

-			getValues().clear();

-			getValues().addAll((Collection<? extends FeatureValue>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.LIST_VALUE__VALUES:

-			getValues().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.LIST_VALUE__VALUES:

-			return values != null && !values.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} // ListValueImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/QueryExecutionValueImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/QueryExecutionValueImpl.java
deleted file mode 100644
index 00902e741ee..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/QueryExecutionValueImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Query Execution Value</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class QueryExecutionValueImpl extends DynamicValueImpl implements QueryExecutionValue {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected QueryExecutionValueImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ApplyStereotypeActionConfigurationPackage.Literals.QUERY_EXECUTION_VALUE;

-	}

-

-} // QueryExecutionValueImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/StereotypeToApplyImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/StereotypeToApplyImpl.java
deleted file mode 100644
index add543d805b..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/impl/StereotypeToApplyImpl.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Stereotype To Apply</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.StereotypeToApplyImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.StereotypeToApplyImpl#isUpdateName <em>Update Name</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.StereotypeToApplyImpl#getRequiredProfiles <em>Required Profiles</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.impl.StereotypeToApplyImpl#getFeaturesToSet <em>Features To Set</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class StereotypeToApplyImpl extends EObjectImpl implements StereotypeToApply {

-	/**

-	 * The default value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getStereotypeQualifiedName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String STEREOTYPE_QUALIFIED_NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getStereotypeQualifiedName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String stereotypeQualifiedName = STEREOTYPE_QUALIFIED_NAME_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #isUpdateName() <em>Update Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isUpdateName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final boolean UPDATE_NAME_EDEFAULT = false;

-

-	/**

-	 * The cached value of the '{@link #isUpdateName() <em>Update Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #isUpdateName()

-	 * @generated

-	 * @ordered

-	 */

-	protected boolean updateName = UPDATE_NAME_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getRequiredProfiles() <em>Required Profiles</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getRequiredProfiles()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> requiredProfiles;

-

-	/**

-	 * The cached value of the '{@link #getFeaturesToSet() <em>Features To Set</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getFeaturesToSet()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<FeatureToSet> featuresToSet;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected StereotypeToApplyImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ApplyStereotypeActionConfigurationPackage.Literals.STEREOTYPE_TO_APPLY;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getStereotypeQualifiedName() {

-		return stereotypeQualifiedName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setStereotypeQualifiedName(String newStereotypeQualifiedName) {

-		String oldStereotypeQualifiedName = stereotypeQualifiedName;

-		stereotypeQualifiedName = newStereotypeQualifiedName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME, oldStereotypeQualifiedName, stereotypeQualifiedName));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public boolean isUpdateName() {

-		return updateName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setUpdateName(boolean newUpdateName) {

-		boolean oldUpdateName = updateName;

-		updateName = newUpdateName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__UPDATE_NAME, oldUpdateName, updateName));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<String> getRequiredProfiles() {

-		if (requiredProfiles == null) {

-			requiredProfiles = new EDataTypeUniqueEList<String>(String.class, this, ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES);

-		}

-		return requiredProfiles;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<FeatureToSet> getFeaturesToSet() {

-		if (featuresToSet == null) {

-			featuresToSet = new EObjectContainmentEList<FeatureToSet>(FeatureToSet.class, this, ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET);

-		}

-		return featuresToSet;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:

-			return ((InternalEList<?>) getFeaturesToSet()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:

-			return getStereotypeQualifiedName();

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:

-			return isUpdateName();

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:

-			return getRequiredProfiles();

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:

-			return getFeaturesToSet();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:

-			setStereotypeQualifiedName((String) newValue);

-			return;

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:

-			setUpdateName((Boolean) newValue);

-			return;

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:

-			getRequiredProfiles().clear();

-			getRequiredProfiles().addAll((Collection<? extends String>) newValue);

-			return;

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:

-			getFeaturesToSet().clear();

-			getFeaturesToSet().addAll((Collection<? extends FeatureToSet>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:

-			setStereotypeQualifiedName(STEREOTYPE_QUALIFIED_NAME_EDEFAULT);

-			return;

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:

-			setUpdateName(UPDATE_NAME_EDEFAULT);

-			return;

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:

-			getRequiredProfiles().clear();

-			return;

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:

-			getFeaturesToSet().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:

-			return STEREOTYPE_QUALIFIED_NAME_EDEFAULT == null ? stereotypeQualifiedName != null : !STEREOTYPE_QUALIFIED_NAME_EDEFAULT.equals(stereotypeQualifiedName);

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:

-			return updateName != UPDATE_NAME_EDEFAULT;

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:

-			return requiredProfiles != null && !requiredProfiles.isEmpty();

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:

-			return featuresToSet != null && !featuresToSet.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (stereotypeQualifiedName: ");

-		result.append(stereotypeQualifiedName);

-		result.append(", updateName: ");

-		result.append(updateName);

-		result.append(", requiredProfiles: ");

-		result.append(requiredProfiles);

-		result.append(')');

-		return result.toString();

-	}

-

-} // StereotypeToApplyImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationAdapterFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationAdapterFactory.java
deleted file mode 100644
index 4d8151e176f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,348 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

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

-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.DynamicValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage

- * @generated

- */

-public class ApplyStereotypeActionConfigurationAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ApplyStereotypeActionConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ApplyStereotypeActionConfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = ApplyStereotypeActionConfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected ApplyStereotypeActionConfigurationSwitch<Adapter> modelSwitch =

-			new ApplyStereotypeActionConfigurationSwitch<Adapter>() {

-				@Override

-				public Adapter caseApplyStereotypeActionConfiguration(ApplyStereotypeActionConfiguration object) {

-					return createApplyStereotypeActionConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseStereotypeToApply(StereotypeToApply object) {

-					return createStereotypeToApplyAdapter();

-				}

-

-				@Override

-				public Adapter caseFeatureToSet(FeatureToSet object) {

-					return createFeatureToSetAdapter();

-				}

-

-				@Override

-				public Adapter caseFeatureValue(FeatureValue object) {

-					return createFeatureValueAdapter();

-				}

-

-				@Override

-				public Adapter caseListValue(ListValue object) {

-					return createListValueAdapter();

-				}

-

-				@Override

-				public Adapter caseConstantValue(ConstantValue object) {

-					return createConstantValueAdapter();

-				}

-

-				@Override

-				public Adapter caseDynamicValue(DynamicValue object) {

-					return createDynamicValueAdapter();

-				}

-

-				@Override

-				public Adapter caseQueryExecutionValue(QueryExecutionValue object) {

-					return createQueryExecutionValueAdapter();

-				}

-

-				@Override

-				public Adapter caseConfigurationElement(ConfigurationElement object) {

-					return createConfigurationElementAdapter();

-				}

-

-				@Override

-				public Adapter caseActionConfiguration(ActionConfiguration object) {

-					return createActionConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseSemanticActionConfiguration(SemanticActionConfiguration object) {

-					return createSemanticActionConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter defaultCase(EObject object) {

-					return createEObjectAdapter();

-				}

-			};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration <em>Apply Stereotype Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration

-	 * @generated

-	 */

-	public Adapter createApplyStereotypeActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply <em>Stereotype To Apply</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply

-	 * @generated

-	 */

-	public Adapter createStereotypeToApplyAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet <em>Feature To Set</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet

-	 * @generated

-	 */

-	public Adapter createFeatureToSetAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue <em>Feature Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue

-	 * @generated

-	 */

-	public Adapter createFeatureValueAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue <em>List Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue

-	 * @generated

-	 */

-	public Adapter createListValueAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue <em>Constant Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue

-	 * @generated

-	 */

-	public Adapter createConstantValueAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.DynamicValue <em>Dynamic Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.DynamicValue

-	 * @generated

-	 */

-	public Adapter createDynamicValueAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue

-	 * @generated

-	 */

-	public Adapter createQueryExecutionValueAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement

-	 * @generated

-	 */

-	public Adapter createConfigurationElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration

-	 * @generated

-	 */

-	public Adapter createActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration <em>Semantic Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration

-	 * @generated

-	 */

-	public Adapter createSemanticActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // ApplyStereotypeActionConfigurationAdapterFactory

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceFactoryImpl.java
deleted file mode 100644
index 1474f2c25b2..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource Factory</b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util.ApplyStereotypeActionConfigurationResourceImpl

- * @generated

- */

-public class ApplyStereotypeActionConfigurationResourceFactoryImpl extends ResourceFactoryImpl {

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ApplyStereotypeActionConfigurationResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new ApplyStereotypeActionConfigurationResourceImpl(uri);

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

-

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);

-

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

-

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);

-		return result;

-	}

-

-} // ApplyStereotypeActionConfigurationResourceFactoryImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceImpl.java
deleted file mode 100644
index 9076c4725f9..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationResourceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource </b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util.ApplyStereotypeActionConfigurationResourceFactoryImpl

- * @generated

- */

-public class ApplyStereotypeActionConfigurationResourceImpl extends XMLResourceImpl {

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public ApplyStereotypeActionConfigurationResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // ApplyStereotypeActionConfigurationResourceImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationSwitch.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationSwitch.java
deleted file mode 100644
index 09bd67a6a30..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationSwitch.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util;

-

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

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ConstantValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.DynamicValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureToSet;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.FeatureValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ListValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.QueryExecutionValue;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.StereotypeToApply;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage

- * @generated

- */

-public class ApplyStereotypeActionConfigurationSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static ApplyStereotypeActionConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ApplyStereotypeActionConfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = ApplyStereotypeActionConfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case ApplyStereotypeActionConfigurationPackage.APPLY_STEREOTYPE_ACTION_CONFIGURATION: {

-			ApplyStereotypeActionConfiguration applyStereotypeActionConfiguration = (ApplyStereotypeActionConfiguration) theEObject;

-			T result = caseApplyStereotypeActionConfiguration(applyStereotypeActionConfiguration);

-			if (result == null) {

-				result = caseSemanticActionConfiguration(applyStereotypeActionConfiguration);

-			}

-			if (result == null) {

-				result = caseActionConfiguration(applyStereotypeActionConfiguration);

-			}

-			if (result == null) {

-				result = caseConfigurationElement(applyStereotypeActionConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ApplyStereotypeActionConfigurationPackage.STEREOTYPE_TO_APPLY: {

-			StereotypeToApply stereotypeToApply = (StereotypeToApply) theEObject;

-			T result = caseStereotypeToApply(stereotypeToApply);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_TO_SET: {

-			FeatureToSet featureToSet = (FeatureToSet) theEObject;

-			T result = caseFeatureToSet(featureToSet);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ApplyStereotypeActionConfigurationPackage.FEATURE_VALUE: {

-			FeatureValue featureValue = (FeatureValue) theEObject;

-			T result = caseFeatureValue(featureValue);

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ApplyStereotypeActionConfigurationPackage.LIST_VALUE: {

-			ListValue listValue = (ListValue) theEObject;

-			T result = caseListValue(listValue);

-			if (result == null) {

-				result = caseFeatureValue(listValue);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ApplyStereotypeActionConfigurationPackage.CONSTANT_VALUE: {

-			ConstantValue constantValue = (ConstantValue) theEObject;

-			T result = caseConstantValue(constantValue);

-			if (result == null) {

-				result = caseFeatureValue(constantValue);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ApplyStereotypeActionConfigurationPackage.DYNAMIC_VALUE: {

-			DynamicValue dynamicValue = (DynamicValue) theEObject;

-			T result = caseDynamicValue(dynamicValue);

-			if (result == null) {

-				result = caseFeatureValue(dynamicValue);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		case ApplyStereotypeActionConfigurationPackage.QUERY_EXECUTION_VALUE: {

-			QueryExecutionValue queryExecutionValue = (QueryExecutionValue) theEObject;

-			T result = caseQueryExecutionValue(queryExecutionValue);

-			if (result == null) {

-				result = caseDynamicValue(queryExecutionValue);

-			}

-			if (result == null) {

-				result = caseFeatureValue(queryExecutionValue);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Apply Stereotype Action Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Apply Stereotype Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseApplyStereotypeActionConfiguration(ApplyStereotypeActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Stereotype To Apply</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Stereotype To Apply</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStereotypeToApply(StereotypeToApply object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature To Set</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Feature To Set</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureToSet(FeatureToSet object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Feature Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Feature Value</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseFeatureValue(FeatureValue object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>List Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>List Value</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseListValue(ListValue object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Constant Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Constant Value</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConstantValue(ConstantValue object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Dynamic Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Dynamic Value</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDynamicValue(DynamicValue object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Query Execution Value</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Query Execution Value</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseQueryExecutionValue(QueryExecutionValue object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Configuration Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Configuration Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConfigurationElement(ConfigurationElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Action Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseActionConfiguration(ActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Action Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Semantic Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSemanticActionConfiguration(SemanticActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // ApplyStereotypeActionConfigurationSwitch

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationXMLProcessor.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationXMLProcessor.java
deleted file mode 100644
index 28375c1640b..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/util/ApplyStereotypeActionConfigurationXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfigurationPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class ApplyStereotypeActionConfigurationXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public ApplyStereotypeActionConfigurationXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		ApplyStereotypeActionConfigurationPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the ApplyStereotypeActionConfigurationResourceFactoryImpl factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

-			super.getRegistrations();

-			registrations.put(XML_EXTENSION, new ApplyStereotypeActionConfigurationResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new ApplyStereotypeActionConfigurationResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // ApplyStereotypeActionConfigurationXMLProcessor

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfiguration.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfiguration.java
deleted file mode 100644
index f08de0c6f60..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfiguration.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration;
-
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Invariant Stereotype Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#getRequiredProfile <em>Required Profile</em>}</li>
- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#isStrict <em>Strict</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage#getInvariantStereotypeConfiguration()
- * @model
- * @generated
- */
-public interface InvariantStereotypeConfiguration extends InvariantRuleConfiguration {
-
-	/**
-	 * Returns the value of the '<em><b>Stereotype Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Stereotype Qualified Name</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Stereotype Qualified Name</em>' attribute.
-	 * @see #setStereotypeQualifiedName(String)
-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage#getInvariantStereotypeConfiguration_StereotypeQualifiedName()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getStereotypeQualifiedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Stereotype Qualified Name</em>' attribute.
-	 * @see #getStereotypeQualifiedName()
-	 * @generated
-	 */
-	void setStereotypeQualifiedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Required Profile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Required Profile</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Required Profile</em>' attribute.
-	 * @see #setRequiredProfile(String)
-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage#getInvariantStereotypeConfiguration_RequiredProfile()
-	 * @model
-	 * @generated
-	 */
-	String getRequiredProfile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#getRequiredProfile <em>Required Profile</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Required Profile</em>' attribute.
-	 * @see #getRequiredProfile()
-	 * @generated
-	 */
-	void setRequiredProfile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Strict</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Strict</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Strict</em>' attribute.
-	 * @see #setStrict(boolean)
-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage#getInvariantStereotypeConfiguration_Strict()
-	 * @model
-	 * @generated
-	 */
-	boolean isStrict();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#isStrict <em>Strict</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Strict</em>' attribute.
-	 * @see #isStrict()
-	 * @generated
-	 */
-	void setStrict(boolean value);
-} // InvariantStereotypeConfiguration
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationFactory.java
deleted file mode 100644
index d183c149897..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage

- * @generated

- */

-public interface InvariantStereotypeConfigurationFactory extends EFactory {

-

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	InvariantStereotypeConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl.InvariantStereotypeConfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Invariant Stereotype Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Invariant Stereotype Configuration</em>'.

-	 * @generated

-	 */

-	InvariantStereotypeConfiguration createInvariantStereotypeConfiguration();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	InvariantStereotypeConfigurationPackage getInvariantStereotypeConfigurationPackage();

-} // InvariantStereotypeConfigurationFactory

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationPackage.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationPackage.java
deleted file mode 100644
index a01c46df0c8..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationPackage.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each operation of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationFactory
- * @model kind="package"
- * @generated
- */
-public interface InvariantStereotypeConfigurationPackage extends EPackage {
-
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNAME = "invariantstereotypeconfiguration";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/stereotype/1.0";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_PREFIX = "invariantstereotypeconfiguration";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	InvariantStereotypeConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl.InvariantStereotypeConfigurationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl.InvariantStereotypeConfigurationImpl <em>Invariant Stereotype Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl.InvariantStereotypeConfigurationImpl
-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl.InvariantStereotypeConfigurationPackageImpl#getInvariantStereotypeConfiguration()
-	 * @generated
-	 */
-	int INVARIANT_STEREOTYPE_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Stereotype Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_STEREOTYPE_CONFIGURATION__STEREOTYPE_QUALIFIED_NAME = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Required Profile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_STEREOTYPE_CONFIGURATION__REQUIRED_PROFILE = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Strict</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_STEREOTYPE_CONFIGURATION__STRICT = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Invariant Stereotype Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_STEREOTYPE_CONFIGURATION_FEATURE_COUNT = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of operations of the '<em>Invariant Stereotype Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_STEREOTYPE_CONFIGURATION_OPERATION_COUNT = InvariantSemanticTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration <em>Invariant Stereotype Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Invariant Stereotype Configuration</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration
-	 * @generated
-	 */
-	EClass getInvariantStereotypeConfiguration();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Stereotype Qualified Name</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#getStereotypeQualifiedName()
-	 * @see #getInvariantStereotypeConfiguration()
-	 * @generated
-	 */
-	EAttribute getInvariantStereotypeConfiguration_StereotypeQualifiedName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#getRequiredProfile <em>Required Profile</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Required Profile</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#getRequiredProfile()
-	 * @see #getInvariantStereotypeConfiguration()
-	 * @generated
-	 */
-	EAttribute getInvariantStereotypeConfiguration_RequiredProfile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#isStrict <em>Strict</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Strict</em>'.
-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration#isStrict()
-	 * @see #getInvariantStereotypeConfiguration()
-	 * @generated
-	 */
-	EAttribute getInvariantStereotypeConfiguration_Strict();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	InvariantStereotypeConfigurationFactory getInvariantStereotypeConfigurationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 * <li>each class,</li>
-	 * <li>each feature of each class,</li>
-	 * <li>each operation of each class,</li>
-	 * <li>each enum,</li>
-	 * <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	interface Literals {
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl.InvariantStereotypeConfigurationImpl <em>Invariant Stereotype Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl.InvariantStereotypeConfigurationImpl
-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl.InvariantStereotypeConfigurationPackageImpl#getInvariantStereotypeConfiguration()
-		 * @generated
-		 */
-		EClass INVARIANT_STEREOTYPE_CONFIGURATION = eINSTANCE.getInvariantStereotypeConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Stereotype Qualified Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute INVARIANT_STEREOTYPE_CONFIGURATION__STEREOTYPE_QUALIFIED_NAME = eINSTANCE.getInvariantStereotypeConfiguration_StereotypeQualifiedName();
-
-		/**
-		 * The meta object literal for the '<em><b>Required Profile</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute INVARIANT_STEREOTYPE_CONFIGURATION__REQUIRED_PROFILE = eINSTANCE.getInvariantStereotypeConfiguration_RequiredProfile();
-
-		/**
-		 * The meta object literal for the '<em><b>Strict</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute INVARIANT_STEREOTYPE_CONFIGURATION__STRICT = eINSTANCE.getInvariantStereotypeConfiguration_Strict();
-	}
-} // InvariantStereotypeConfigurationPackage
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationFactoryImpl.java
deleted file mode 100644
index 4d5b4e7097f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

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

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationFactory;

-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class InvariantStereotypeConfigurationFactoryImpl extends EFactoryImpl implements InvariantStereotypeConfigurationFactory {

-

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static InvariantStereotypeConfigurationFactory init() {

-		try {

-			InvariantStereotypeConfigurationFactory theInvariantStereotypeConfigurationFactory = (InvariantStereotypeConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(InvariantStereotypeConfigurationPackage.eNS_URI);

-			if (theInvariantStereotypeConfigurationFactory != null) {

-				return theInvariantStereotypeConfigurationFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new InvariantStereotypeConfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantStereotypeConfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION:

-			return createInvariantStereotypeConfiguration();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantStereotypeConfiguration createInvariantStereotypeConfiguration() {

-		InvariantStereotypeConfigurationImpl invariantStereotypeConfiguration = new InvariantStereotypeConfigurationImpl();

-		return invariantStereotypeConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantStereotypeConfigurationPackage getInvariantStereotypeConfigurationPackage() {

-		return (InvariantStereotypeConfigurationPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static InvariantStereotypeConfigurationPackage getPackage() {

-		return InvariantStereotypeConfigurationPackage.eINSTANCE;

-	}

-} // InvariantStereotypeConfigurationFactoryImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationImpl.java
deleted file mode 100644
index 7c668b1054d..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationImpl.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.impl.InvariantRuleConfigurationImpl;
-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration;
-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Invariant Stereotype Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl.InvariantStereotypeConfigurationImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl.InvariantStereotypeConfigurationImpl#getRequiredProfile <em>Required Profile</em>}</li>
- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl.InvariantStereotypeConfigurationImpl#isStrict <em>Strict</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InvariantStereotypeConfigurationImpl extends InvariantRuleConfigurationImpl implements InvariantStereotypeConfiguration {
-
-	/**
-	 * The default value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getStereotypeQualifiedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String STEREOTYPE_QUALIFIED_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getStereotypeQualifiedName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String stereotypeQualifiedName = STEREOTYPE_QUALIFIED_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRequiredProfile() <em>Required Profile</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getRequiredProfile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REQUIRED_PROFILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getRequiredProfile() <em>Required Profile</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getRequiredProfile()
-	 * @generated
-	 * @ordered
-	 */
-	protected String requiredProfile = REQUIRED_PROFILE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isStrict() <em>Strict</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #isStrict()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean STRICT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isStrict() <em>Strict</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #isStrict()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean strict = STRICT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected InvariantStereotypeConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return InvariantStereotypeConfigurationPackage.Literals.INVARIANT_STEREOTYPE_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getStereotypeQualifiedName() {
-		return stereotypeQualifiedName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setStereotypeQualifiedName(String newStereotypeQualifiedName) {
-		String oldStereotypeQualifiedName = stereotypeQualifiedName;
-		stereotypeQualifiedName = newStereotypeQualifiedName;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__STEREOTYPE_QUALIFIED_NAME, oldStereotypeQualifiedName, stereotypeQualifiedName));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getRequiredProfile() {
-		return requiredProfile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setRequiredProfile(String newRequiredProfile) {
-		String oldRequiredProfile = requiredProfile;
-		requiredProfile = newRequiredProfile;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__REQUIRED_PROFILE, oldRequiredProfile, requiredProfile));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public boolean isStrict() {
-		return strict;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setStrict(boolean newStrict) {
-		boolean oldStrict = strict;
-		strict = newStrict;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__STRICT, oldStrict, strict));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__STEREOTYPE_QUALIFIED_NAME:
-			return getStereotypeQualifiedName();
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__REQUIRED_PROFILE:
-			return getRequiredProfile();
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__STRICT:
-			return isStrict();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__STEREOTYPE_QUALIFIED_NAME:
-			setStereotypeQualifiedName((String) newValue);
-			return;
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__REQUIRED_PROFILE:
-			setRequiredProfile((String) newValue);
-			return;
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__STRICT:
-			setStrict((Boolean) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__STEREOTYPE_QUALIFIED_NAME:
-			setStereotypeQualifiedName(STEREOTYPE_QUALIFIED_NAME_EDEFAULT);
-			return;
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__REQUIRED_PROFILE:
-			setRequiredProfile(REQUIRED_PROFILE_EDEFAULT);
-			return;
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__STRICT:
-			setStrict(STRICT_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__STEREOTYPE_QUALIFIED_NAME:
-			return STEREOTYPE_QUALIFIED_NAME_EDEFAULT == null ? stereotypeQualifiedName != null : !STEREOTYPE_QUALIFIED_NAME_EDEFAULT.equals(stereotypeQualifiedName);
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__REQUIRED_PROFILE:
-			return REQUIRED_PROFILE_EDEFAULT == null ? requiredProfile != null : !REQUIRED_PROFILE_EDEFAULT.equals(requiredProfile);
-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION__STRICT:
-			return strict != STRICT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (stereotypeQualifiedName: ");
-		result.append(stereotypeQualifiedName);
-		result.append(", requiredProfile: ");
-		result.append(requiredProfile);
-		result.append(", strict: ");
-		result.append(strict);
-		result.append(')');
-		return result.toString();
-	}
-} // InvariantStereotypeConfigurationImpl
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationPackageImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationPackageImpl.java
deleted file mode 100644
index 8d6223d1611..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/impl/InvariantStereotypeConfigurationPackageImpl.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- * Copyright (c) 2013 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:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantSemanticTypeConfigurationPackage;
-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration;
-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationFactory;
-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InvariantStereotypeConfigurationPackageImpl extends EPackageImpl implements InvariantStereotypeConfigurationPackage {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass invariantStereotypeConfigurationEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private InvariantStereotypeConfigurationPackageImpl() {
-		super(eNS_URI, InvariantStereotypeConfigurationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
-	 * <p>
-	 * This method is used to initialize {@link InvariantStereotypeConfigurationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static InvariantStereotypeConfigurationPackage init() {
-		if (isInited) {
-			return (InvariantStereotypeConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantStereotypeConfigurationPackage.eNS_URI);
-		}
-
-		// Obtain or create and register package
-		InvariantStereotypeConfigurationPackageImpl theInvariantStereotypeConfigurationPackage = (InvariantStereotypeConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InvariantStereotypeConfigurationPackageImpl ? EPackage.Registry.INSTANCE
-				.get(eNS_URI)
-				: new InvariantStereotypeConfigurationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		InvariantSemanticTypeConfigurationPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theInvariantStereotypeConfigurationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theInvariantStereotypeConfigurationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theInvariantStereotypeConfigurationPackage.freeze();
-
-
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(InvariantStereotypeConfigurationPackage.eNS_URI, theInvariantStereotypeConfigurationPackage);
-		return theInvariantStereotypeConfigurationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getInvariantStereotypeConfiguration() {
-		return invariantStereotypeConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getInvariantStereotypeConfiguration_StereotypeQualifiedName() {
-		return (EAttribute) invariantStereotypeConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getInvariantStereotypeConfiguration_RequiredProfile() {
-		return (EAttribute) invariantStereotypeConfigurationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getInvariantStereotypeConfiguration_Strict() {
-		return (EAttribute) invariantStereotypeConfigurationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public InvariantStereotypeConfigurationFactory getInvariantStereotypeConfigurationFactory() {
-		return (InvariantStereotypeConfigurationFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package. This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) {
-			return;
-		}
-		isCreated = true;
-
-		// Create classes and their features
-		invariantStereotypeConfigurationEClass = createEClass(INVARIANT_STEREOTYPE_CONFIGURATION);
-		createEAttribute(invariantStereotypeConfigurationEClass, INVARIANT_STEREOTYPE_CONFIGURATION__STEREOTYPE_QUALIFIED_NAME);
-		createEAttribute(invariantStereotypeConfigurationEClass, INVARIANT_STEREOTYPE_CONFIGURATION__REQUIRED_PROFILE);
-		createEAttribute(invariantStereotypeConfigurationEClass, INVARIANT_STEREOTYPE_CONFIGURATION__STRICT);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model. This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) {
-			return;
-		}
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		InvariantSemanticTypeConfigurationPackage theInvariantSemanticTypeConfigurationPackage = (InvariantSemanticTypeConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantSemanticTypeConfigurationPackage.eNS_URI);
-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		invariantStereotypeConfigurationEClass.getESuperTypes().add(theInvariantSemanticTypeConfigurationPackage.getInvariantRuleConfiguration());
-
-		// Initialize classes, features, and operations; add parameters
-		initEClass(invariantStereotypeConfigurationEClass, InvariantStereotypeConfiguration.class, "InvariantStereotypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getInvariantStereotypeConfiguration_StereotypeQualifiedName(), theEcorePackage.getEString(), "stereotypeQualifiedName", null, 1, 1, InvariantStereotypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getInvariantStereotypeConfiguration_RequiredProfile(), theEcorePackage.getEString(), "requiredProfile", null, 0, 1, InvariantStereotypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getInvariantStereotypeConfiguration_Strict(), ecorePackage.getEBoolean(), "strict", null, 0, 1, InvariantStereotypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} // InvariantStereotypeConfigurationPackageImpl
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationAdapterFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationAdapterFactory.java
deleted file mode 100644
index ed4d1b6eab3..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

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

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage

- * @generated

- */

-public class InvariantStereotypeConfigurationAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static InvariantStereotypeConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantStereotypeConfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = InvariantStereotypeConfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected InvariantStereotypeConfigurationSwitch<Adapter> modelSwitch = new InvariantStereotypeConfigurationSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseInvariantStereotypeConfiguration(InvariantStereotypeConfiguration object) {

-			return createInvariantStereotypeConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {

-			return createInvariantRuleConfigurationAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration <em>Invariant Stereotype Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration

-	 * @generated

-	 */

-	public Adapter createInvariantStereotypeConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration

-	 * @generated

-	 */

-	public Adapter createInvariantRuleConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-} // InvariantStereotypeConfigurationAdapterFactory

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceFactoryImpl.java
deleted file mode 100644
index 05d4416cf44..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource Factory</b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.util.InvariantStereotypeConfigurationResourceImpl

- * @generated

- */

-public class InvariantStereotypeConfigurationResourceFactoryImpl extends ResourceFactoryImpl {

-

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantStereotypeConfigurationResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new InvariantStereotypeConfigurationResourceImpl(uri);

-		return result;

-	}

-} // InvariantStereotypeConfigurationResourceFactoryImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceImpl.java
deleted file mode 100644
index aad55687bdf..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationResourceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource </b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.util.InvariantStereotypeConfigurationResourceFactoryImpl

- * @generated

- */

-public class InvariantStereotypeConfigurationResourceImpl extends XMLResourceImpl {

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public InvariantStereotypeConfigurationResourceImpl(URI uri) {

-		super(uri);

-	}

-} // InvariantStereotypeConfigurationResourceImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationSwitch.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationSwitch.java
deleted file mode 100644
index 5713071d8a8..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationSwitch.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.util;

-

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

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage

- * @generated

- */

-public class InvariantStereotypeConfigurationSwitch<T> extends Switch<T> {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static InvariantStereotypeConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantStereotypeConfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = InvariantStereotypeConfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case InvariantStereotypeConfigurationPackage.INVARIANT_STEREOTYPE_CONFIGURATION: {

-			InvariantStereotypeConfiguration invariantStereotypeConfiguration = (InvariantStereotypeConfiguration) theEObject;

-			T result = caseInvariantStereotypeConfiguration(invariantStereotypeConfiguration);

-			if (result == null) {

-				result = caseInvariantRuleConfiguration(invariantStereotypeConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Stereotype Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Invariant Stereotype Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseInvariantStereotypeConfiguration(InvariantStereotypeConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-} // InvariantStereotypeConfigurationSwitch

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationXMLProcessor.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationXMLProcessor.java
deleted file mode 100644
index cb69893020a..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/util/InvariantStereotypeConfigurationXMLProcessor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

-import org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration.InvariantStereotypeConfigurationPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class InvariantStereotypeConfigurationXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public InvariantStereotypeConfigurationXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		InvariantStereotypeConfigurationPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the InvariantStereotypeConfigurationResourceFactoryImpl factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

-			super.getRegistrations();

-			registrations.put(XML_EXTENSION, new InvariantStereotypeConfigurationResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new InvariantStereotypeConfigurationResourceFactoryImpl());

-		}

-		return registrations;

-	}

-} // InvariantStereotypeConfigurationXMLProcessor

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfiguration.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfiguration.java
deleted file mode 100644
index bdacf00737f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfiguration.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Set Type Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration#getValidTypes <em>Valid Types</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration#getCreationTypes <em>Creation Types</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage#getSetTypeActionConfiguration()

- * @model

- * @generated

- */

-public interface SetTypeActionConfiguration extends SemanticActionConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Valid Types</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Valid Types</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Valid Types</em>' attribute list.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage#getSetTypeActionConfiguration_ValidTypes()

-	 * @model

-	 * @generated

-	 */

-	EList<String> getValidTypes();

-

-	/**

-	 * Returns the value of the '<em><b>Creation Types</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Creation Types</em>' attribute list isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Creation Types</em>' attribute list.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage#getSetTypeActionConfiguration_CreationTypes()

-	 * @model

-	 * @generated

-	 */

-	EList<String> getCreationTypes();

-

-} // SetTypeActionConfiguration

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfigurationFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfigurationFactory.java
deleted file mode 100644
index 5e8c67bed04..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfigurationFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage

- * @generated

- */

-public interface SetTypeActionConfigurationFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	SetTypeActionConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl.SetTypeActionConfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Set Type Action Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Set Type Action Configuration</em>'.

-	 * @generated

-	 */

-	SetTypeActionConfiguration createSetTypeActionConfiguration();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	SetTypeActionConfigurationPackage getSetTypeActionConfigurationPackage();

-

-} // SetTypeActionConfigurationFactory

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfigurationPackage.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfigurationPackage.java
deleted file mode 100644
index cadd0fb7b39..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfigurationPackage.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationFactory

- * @model kind="package"

- * @generated

- */

-public interface SetTypeActionConfigurationPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "settypeactionconfiguration";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/extendedtypes/uml/settypeaction/1.0";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "settypeactionconfiguration";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	SetTypeActionConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl.SetTypeActionConfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl.SetTypeActionConfigurationImpl <em>Set Type Action Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl.SetTypeActionConfigurationImpl

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl.SetTypeActionConfigurationPackageImpl#getSetTypeActionConfiguration()

-	 * @generated

-	 */

-	int SET_TYPE_ACTION_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_TYPE_ACTION_CONFIGURATION__NAME = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_TYPE_ACTION_CONFIGURATION__DESCRIPTION = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_TYPE_ACTION_CONFIGURATION__IDENTIFIER = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__IDENTIFIER;

-

-	/**

-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_TYPE_ACTION_CONFIGURATION__ICON_ENTRY = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION__ICON_ENTRY;

-

-	/**

-	 * The feature id for the '<em><b>Valid Types</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_TYPE_ACTION_CONFIGURATION__VALID_TYPES = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Creation Types</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_TYPE_ACTION_CONFIGURATION__CREATION_TYPES = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Set Type Action Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int SET_TYPE_ACTION_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.SEMANTIC_ACTION_CONFIGURATION_FEATURE_COUNT + 2;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration <em>Set Type Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Set Type Action Configuration</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration

-	 * @generated

-	 */

-	EClass getSetTypeActionConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration#getValidTypes <em>Valid Types</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Valid Types</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration#getValidTypes()

-	 * @see #getSetTypeActionConfiguration()

-	 * @generated

-	 */

-	EAttribute getSetTypeActionConfiguration_ValidTypes();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration#getCreationTypes <em>Creation Types</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute list '<em>Creation Types</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration#getCreationTypes()

-	 * @see #getSetTypeActionConfiguration()

-	 * @generated

-	 */

-	EAttribute getSetTypeActionConfiguration_CreationTypes();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	SetTypeActionConfigurationFactory getSetTypeActionConfigurationFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl.SetTypeActionConfigurationImpl <em>Set Type Action Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl.SetTypeActionConfigurationImpl

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl.SetTypeActionConfigurationPackageImpl#getSetTypeActionConfiguration()

-		 * @generated

-		 */

-		EClass SET_TYPE_ACTION_CONFIGURATION = eINSTANCE.getSetTypeActionConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Valid Types</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute SET_TYPE_ACTION_CONFIGURATION__VALID_TYPES = eINSTANCE.getSetTypeActionConfiguration_ValidTypes();

-

-		/**

-		 * The meta object literal for the '<em><b>Creation Types</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute SET_TYPE_ACTION_CONFIGURATION__CREATION_TYPES = eINSTANCE.getSetTypeActionConfiguration_CreationTypes();

-

-	}

-

-} // SetTypeActionConfigurationPackage

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/impl/SetTypeActionConfigurationFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/impl/SetTypeActionConfigurationFactoryImpl.java
deleted file mode 100644
index adf3a9410eb..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/impl/SetTypeActionConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

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

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationFactory;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class SetTypeActionConfigurationFactoryImpl extends EFactoryImpl implements SetTypeActionConfigurationFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static SetTypeActionConfigurationFactory init() {

-		try {

-			SetTypeActionConfigurationFactory theSetTypeActionConfigurationFactory = (SetTypeActionConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(SetTypeActionConfigurationPackage.eNS_URI);

-			if (theSetTypeActionConfigurationFactory != null) {

-				return theSetTypeActionConfigurationFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new SetTypeActionConfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SetTypeActionConfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION:

-			return createSetTypeActionConfiguration();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SetTypeActionConfiguration createSetTypeActionConfiguration() {

-		SetTypeActionConfigurationImpl setTypeActionConfiguration = new SetTypeActionConfigurationImpl();

-		return setTypeActionConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SetTypeActionConfigurationPackage getSetTypeActionConfigurationPackage() {

-		return (SetTypeActionConfigurationPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static SetTypeActionConfigurationPackage getPackage() {

-		return SetTypeActionConfigurationPackage.eINSTANCE;

-	}

-

-} // SetTypeActionConfigurationFactoryImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/impl/SetTypeActionConfigurationImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/impl/SetTypeActionConfigurationImpl.java
deleted file mode 100644
index aa4e0c0ca00..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/impl/SetTypeActionConfigurationImpl.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

-import org.eclipse.papyrus.infra.extendedtypes.impl.SemanticActionConfigurationImpl;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Set Type Action Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl.SetTypeActionConfigurationImpl#getValidTypes <em>Valid Types</em>}</li>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl.SetTypeActionConfigurationImpl#getCreationTypes <em>Creation Types</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class SetTypeActionConfigurationImpl extends SemanticActionConfigurationImpl implements SetTypeActionConfiguration {

-	/**

-	 * The cached value of the '{@link #getValidTypes() <em>Valid Types</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getValidTypes()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> validTypes;

-

-	/**

-	 * The cached value of the '{@link #getCreationTypes() <em>Creation Types</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getCreationTypes()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> creationTypes;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SetTypeActionConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return SetTypeActionConfigurationPackage.Literals.SET_TYPE_ACTION_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<String> getValidTypes() {

-		if (validTypes == null) {

-			validTypes = new EDataTypeUniqueEList<String>(String.class, this, SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION__VALID_TYPES);

-		}

-		return validTypes;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EList<String> getCreationTypes() {

-		if (creationTypes == null) {

-			creationTypes = new EDataTypeUniqueEList<String>(String.class, this, SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION__CREATION_TYPES);

-		}

-		return creationTypes;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION__VALID_TYPES:

-			return getValidTypes();

-		case SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION__CREATION_TYPES:

-			return getCreationTypes();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION__VALID_TYPES:

-			getValidTypes().clear();

-			getValidTypes().addAll((Collection<? extends String>) newValue);

-			return;

-		case SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION__CREATION_TYPES:

-			getCreationTypes().clear();

-			getCreationTypes().addAll((Collection<? extends String>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION__VALID_TYPES:

-			getValidTypes().clear();

-			return;

-		case SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION__CREATION_TYPES:

-			getCreationTypes().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION__VALID_TYPES:

-			return validTypes != null && !validTypes.isEmpty();

-		case SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION__CREATION_TYPES:

-			return creationTypes != null && !creationTypes.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (validTypes: ");

-		result.append(validTypes);

-		result.append(", creationTypes: ");

-		result.append(creationTypes);

-		result.append(')');

-		return result.toString();

-	}

-

-} // SetTypeActionConfigurationImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/impl/SetTypeActionConfigurationPackageImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/impl/SetTypeActionConfigurationPackageImpl.java
deleted file mode 100644
index d850b824da9..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/impl/SetTypeActionConfigurationPackageImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationFactory;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class SetTypeActionConfigurationPackageImpl extends EPackageImpl implements SetTypeActionConfigurationPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass setTypeActionConfigurationEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private SetTypeActionConfigurationPackageImpl() {

-		super(eNS_URI, SetTypeActionConfigurationFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link SetTypeActionConfigurationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static SetTypeActionConfigurationPackage init() {

-		if (isInited) {

-			return (SetTypeActionConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(SetTypeActionConfigurationPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		SetTypeActionConfigurationPackageImpl theSetTypeActionConfigurationPackage = (SetTypeActionConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SetTypeActionConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)

-				: new SetTypeActionConfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		ExtendedtypesPackage.eINSTANCE.eClass();

-

-		// Create package meta-data objects

-		theSetTypeActionConfigurationPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theSetTypeActionConfigurationPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theSetTypeActionConfigurationPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(SetTypeActionConfigurationPackage.eNS_URI, theSetTypeActionConfigurationPackage);

-		return theSetTypeActionConfigurationPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getSetTypeActionConfiguration() {

-		return setTypeActionConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getSetTypeActionConfiguration_ValidTypes() {

-		return (EAttribute) setTypeActionConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getSetTypeActionConfiguration_CreationTypes() {

-		return (EAttribute) setTypeActionConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SetTypeActionConfigurationFactory getSetTypeActionConfigurationFactory() {

-		return (SetTypeActionConfigurationFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		setTypeActionConfigurationEClass = createEClass(SET_TYPE_ACTION_CONFIGURATION);

-		createEAttribute(setTypeActionConfigurationEClass, SET_TYPE_ACTION_CONFIGURATION__VALID_TYPES);

-		createEAttribute(setTypeActionConfigurationEClass, SET_TYPE_ACTION_CONFIGURATION__CREATION_TYPES);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		setTypeActionConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getSemanticActionConfiguration());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(setTypeActionConfigurationEClass, SetTypeActionConfiguration.class, "SetTypeActionConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getSetTypeActionConfiguration_ValidTypes(), theEcorePackage.getEString(), "validTypes", null, 0, -1, SetTypeActionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-		initEAttribute(getSetTypeActionConfiguration_CreationTypes(), theEcorePackage.getEString(), "creationTypes", null, 0, -1, SetTypeActionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,

-				IS_ORDERED);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // SetTypeActionConfigurationPackageImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/util/SetTypeActionConfigurationAdapterFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/util/SetTypeActionConfigurationAdapterFactory.java
deleted file mode 100644
index d5c68463103..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/util/SetTypeActionConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

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

-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage

- * @generated

- */

-public class SetTypeActionConfigurationAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static SetTypeActionConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SetTypeActionConfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = SetTypeActionConfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected SetTypeActionConfigurationSwitch<Adapter> modelSwitch =

-			new SetTypeActionConfigurationSwitch<Adapter>() {

-				@Override

-				public Adapter caseSetTypeActionConfiguration(SetTypeActionConfiguration object) {

-					return createSetTypeActionConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseConfigurationElement(ConfigurationElement object) {

-					return createConfigurationElementAdapter();

-				}

-

-				@Override

-				public Adapter caseActionConfiguration(ActionConfiguration object) {

-					return createActionConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseSemanticActionConfiguration(SemanticActionConfiguration object) {

-					return createSemanticActionConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter defaultCase(EObject object) {

-					return createEObjectAdapter();

-				}

-			};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration <em>Set Type Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration

-	 * @generated

-	 */

-	public Adapter createSetTypeActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement <em>Configuration Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement

-	 * @generated

-	 */

-	public Adapter createConfigurationElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration <em>Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration

-	 * @generated

-	 */

-	public Adapter createActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration <em>Semantic Action Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration

-	 * @generated

-	 */

-	public Adapter createSemanticActionConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // SetTypeActionConfigurationAdapterFactory

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/util/SetTypeActionConfigurationSwitch.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/util/SetTypeActionConfigurationSwitch.java
deleted file mode 100644
index 657822d3ee3..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/util/SetTypeActionConfigurationSwitch.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.util;

-

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

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.extendedtypes.ActionConfiguration;

-import org.eclipse.papyrus.infra.extendedtypes.ConfigurationElement;

-import org.eclipse.papyrus.infra.extendedtypes.SemanticActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration.SetTypeActionConfigurationPackage

- * @generated

- */

-public class SetTypeActionConfigurationSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static SetTypeActionConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public SetTypeActionConfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = SetTypeActionConfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case SetTypeActionConfigurationPackage.SET_TYPE_ACTION_CONFIGURATION: {

-			SetTypeActionConfiguration setTypeActionConfiguration = (SetTypeActionConfiguration) theEObject;

-			T result = caseSetTypeActionConfiguration(setTypeActionConfiguration);

-			if (result == null) {

-				result = caseSemanticActionConfiguration(setTypeActionConfiguration);

-			}

-			if (result == null) {

-				result = caseActionConfiguration(setTypeActionConfiguration);

-			}

-			if (result == null) {

-				result = caseConfigurationElement(setTypeActionConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Set Type Action Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Set Type Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSetTypeActionConfiguration(SetTypeActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Configuration Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Configuration Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseConfigurationElement(ConfigurationElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Action Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseActionConfiguration(ActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Semantic Action Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Semantic Action Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSemanticActionConfiguration(SemanticActionConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // SetTypeActionConfigurationSwitch

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfiguration.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfiguration.java
deleted file mode 100644
index 047cca5ccad..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfiguration.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration;

-

-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Stereotyped Element Matcher Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration#getStereotypedQualifiedName <em>Stereotyped Qualified Name</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage#getStereotypedElementMatcherConfiguration()

- * @model

- * @generated

- */

-public interface StereotypedElementMatcherConfiguration extends MatcherConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Stereotyped Qualified Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Stereotyped Qualified Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the value of the '<em>Stereotyped Qualified Name</em>' attribute.

-	 * @see #setStereotypedQualifiedName(String)

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage#getStereotypedElementMatcherConfiguration_StereotypedQualifiedName()

-	 * @model

-	 * @generated

-	 */

-	String getStereotypedQualifiedName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration#getStereotypedQualifiedName <em>Stereotyped Qualified Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param value

-	 *            the new value of the '<em>Stereotyped Qualified Name</em>' attribute.

-	 * @see #getStereotypedQualifiedName()

-	 * @generated

-	 */

-	void setStereotypedQualifiedName(String value);

-

-} // StereotypedElementMatcherConfiguration

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfigurationFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfigurationFactory.java
deleted file mode 100644
index 631d1ee74b4..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfigurationFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage

- * @generated

- */

-public interface StereotypedElementMatcherConfigurationFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	StereotypedElementMatcherConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl.StereotypedElementMatcherConfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Stereotyped Element Matcher Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return a new object of class '<em>Stereotyped Element Matcher Configuration</em>'.

-	 * @generated

-	 */

-	StereotypedElementMatcherConfiguration createStereotypedElementMatcherConfiguration();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	StereotypedElementMatcherConfigurationPackage getStereotypedElementMatcherConfigurationPackage();

-

-} // StereotypedElementMatcherConfigurationFactory

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfigurationPackage.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfigurationPackage.java
deleted file mode 100644
index 4632abfd518..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherConfigurationPackage.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationFactory

- * @model kind="package"

- * @generated

- */

-public interface StereotypedElementMatcherConfigurationPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNAME = "stereotypedelementmatcherconfiguration";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/payrus/extendedtypes/uml/stereotypematcherconfiguration";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	String eNS_PREFIX = "stereotypedelementmatcherconfiguration";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	StereotypedElementMatcherConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl.StereotypedElementMatcherConfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl.StereotypedElementMatcherConfigurationImpl <em>Stereotyped Element Matcher Configuration</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl.StereotypedElementMatcherConfigurationImpl

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl.StereotypedElementMatcherConfigurationPackageImpl#getStereotypedElementMatcherConfiguration()

-	 * @generated

-	 */

-	int STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Stereotyped Qualified Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION__STEREOTYPED_QUALIFIED_NAME = ExtendedtypesPackage.MATCHER_CONFIGURATION_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Stereotyped Element Matcher Configuration</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 * @ordered

-	 */

-	int STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION_FEATURE_COUNT = ExtendedtypesPackage.MATCHER_CONFIGURATION_FEATURE_COUNT + 1;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration <em>Stereotyped Element Matcher Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for class '<em>Stereotyped Element Matcher Configuration</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration

-	 * @generated

-	 */

-	EClass getStereotypedElementMatcherConfiguration();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration#getStereotypedQualifiedName <em>Stereotyped Qualified Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the meta object for the attribute '<em>Stereotyped Qualified Name</em>'.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration#getStereotypedQualifiedName()

-	 * @see #getStereotypedElementMatcherConfiguration()

-	 * @generated

-	 */

-	EAttribute getStereotypedElementMatcherConfiguration_StereotypedQualifiedName();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	StereotypedElementMatcherConfigurationFactory getStereotypedElementMatcherConfigurationFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each operation of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl.StereotypedElementMatcherConfigurationImpl <em>Stereotyped Element Matcher Configuration</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl.StereotypedElementMatcherConfigurationImpl

-		 * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl.StereotypedElementMatcherConfigurationPackageImpl#getStereotypedElementMatcherConfiguration()

-		 * @generated

-		 */

-		EClass STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION = eINSTANCE.getStereotypedElementMatcherConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Stereotyped Qualified Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		EAttribute STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION__STEREOTYPED_QUALIFIED_NAME = eINSTANCE.getStereotypedElementMatcherConfiguration_StereotypedQualifiedName();

-

-	}

-

-} // StereotypedElementMatcherConfigurationPackage

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationFactoryImpl.java
deleted file mode 100644
index 190f20f9b0f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

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

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationFactory;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class StereotypedElementMatcherConfigurationFactoryImpl extends EFactoryImpl implements StereotypedElementMatcherConfigurationFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static StereotypedElementMatcherConfigurationFactory init() {

-		try {

-			StereotypedElementMatcherConfigurationFactory theStereotypedElementMatcherConfigurationFactory = (StereotypedElementMatcherConfigurationFactory) EPackage.Registry.INSTANCE.getEFactory(StereotypedElementMatcherConfigurationPackage.eNS_URI);

-			if (theStereotypedElementMatcherConfigurationFactory != null) {

-				return theStereotypedElementMatcherConfigurationFactory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new StereotypedElementMatcherConfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StereotypedElementMatcherConfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case StereotypedElementMatcherConfigurationPackage.STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION:

-			return createStereotypedElementMatcherConfiguration();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StereotypedElementMatcherConfiguration createStereotypedElementMatcherConfiguration() {

-		StereotypedElementMatcherConfigurationImpl stereotypedElementMatcherConfiguration = new StereotypedElementMatcherConfigurationImpl();

-		return stereotypedElementMatcherConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StereotypedElementMatcherConfigurationPackage getStereotypedElementMatcherConfigurationPackage() {

-		return (StereotypedElementMatcherConfigurationPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static StereotypedElementMatcherConfigurationPackage getPackage() {

-		return StereotypedElementMatcherConfigurationPackage.eINSTANCE;

-	}

-

-} // StereotypedElementMatcherConfigurationFactoryImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationImpl.java
deleted file mode 100644
index fb35796bf31..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationImpl.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.papyrus.infra.extendedtypes.impl.MatcherConfigurationImpl;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Stereotyped Element Matcher Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl.StereotypedElementMatcherConfigurationImpl#getStereotypedQualifiedName <em>Stereotyped Qualified Name</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class StereotypedElementMatcherConfigurationImpl extends MatcherConfigurationImpl implements StereotypedElementMatcherConfiguration {

-	/**

-	 * The default value of the '{@link #getStereotypedQualifiedName() <em>Stereotyped Qualified Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getStereotypedQualifiedName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String STEREOTYPED_QUALIFIED_NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getStereotypedQualifiedName() <em>Stereotyped Qualified Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @see #getStereotypedQualifiedName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String stereotypedQualifiedName = STEREOTYPED_QUALIFIED_NAME_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected StereotypedElementMatcherConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return StereotypedElementMatcherConfigurationPackage.Literals.STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public String getStereotypedQualifiedName() {

-		return stereotypedQualifiedName;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void setStereotypedQualifiedName(String newStereotypedQualifiedName) {

-		String oldStereotypedQualifiedName = stereotypedQualifiedName;

-		stereotypedQualifiedName = newStereotypedQualifiedName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, StereotypedElementMatcherConfigurationPackage.STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION__STEREOTYPED_QUALIFIED_NAME, oldStereotypedQualifiedName, stereotypedQualifiedName));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case StereotypedElementMatcherConfigurationPackage.STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION__STEREOTYPED_QUALIFIED_NAME:

-			return getStereotypedQualifiedName();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case StereotypedElementMatcherConfigurationPackage.STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION__STEREOTYPED_QUALIFIED_NAME:

-			setStereotypedQualifiedName((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case StereotypedElementMatcherConfigurationPackage.STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION__STEREOTYPED_QUALIFIED_NAME:

-			setStereotypedQualifiedName(STEREOTYPED_QUALIFIED_NAME_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case StereotypedElementMatcherConfigurationPackage.STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION__STEREOTYPED_QUALIFIED_NAME:

-			return STEREOTYPED_QUALIFIED_NAME_EDEFAULT == null ? stereotypedQualifiedName != null : !STEREOTYPED_QUALIFIED_NAME_EDEFAULT.equals(stereotypedQualifiedName);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (stereotypedQualifiedName: ");

-		result.append(stereotypedQualifiedName);

-		result.append(')');

-		return result.toString();

-	}

-

-} // StereotypedElementMatcherConfigurationImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationPackageImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationPackageImpl.java
deleted file mode 100644
index 2329137883f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/impl/StereotypedElementMatcherConfigurationPackageImpl.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationFactory;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class StereotypedElementMatcherConfigurationPackageImpl extends EPackageImpl implements StereotypedElementMatcherConfigurationPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private EClass stereotypedElementMatcherConfigurationEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private StereotypedElementMatcherConfigurationPackageImpl() {

-		super(eNS_URI, StereotypedElementMatcherConfigurationFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 *

-	 * <p>

-	 * This method is used to initialize {@link StereotypedElementMatcherConfigurationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 *

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static StereotypedElementMatcherConfigurationPackage init() {

-		if (isInited) {

-			return (StereotypedElementMatcherConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(StereotypedElementMatcherConfigurationPackage.eNS_URI);

-		}

-

-		// Obtain or create and register package

-		StereotypedElementMatcherConfigurationPackageImpl theStereotypedElementMatcherConfigurationPackage = (StereotypedElementMatcherConfigurationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StereotypedElementMatcherConfigurationPackageImpl ? EPackage.Registry.INSTANCE

-				.get(eNS_URI) : new StereotypedElementMatcherConfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		ExtendedtypesPackage.eINSTANCE.eClass();

-

-		// Create package meta-data objects

-		theStereotypedElementMatcherConfigurationPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theStereotypedElementMatcherConfigurationPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theStereotypedElementMatcherConfigurationPackage.freeze();

-

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(StereotypedElementMatcherConfigurationPackage.eNS_URI, theStereotypedElementMatcherConfigurationPackage);

-		return theStereotypedElementMatcherConfigurationPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EClass getStereotypedElementMatcherConfiguration() {

-		return stereotypedElementMatcherConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public EAttribute getStereotypedElementMatcherConfiguration_StereotypedQualifiedName() {

-		return (EAttribute) stereotypedElementMatcherConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StereotypedElementMatcherConfigurationFactory getStereotypedElementMatcherConfigurationFactory() {

-		return (StereotypedElementMatcherConfigurationFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) {

-			return;

-		}

-		isCreated = true;

-

-		// Create classes and their features

-		stereotypedElementMatcherConfigurationEClass = createEClass(STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION);

-		createEAttribute(stereotypedElementMatcherConfigurationEClass, STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION__STEREOTYPED_QUALIFIED_NAME);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) {

-			return;

-		}

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		ExtendedtypesPackage theExtendedtypesPackage = (ExtendedtypesPackage) EPackage.Registry.INSTANCE.getEPackage(ExtendedtypesPackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		stereotypedElementMatcherConfigurationEClass.getESuperTypes().add(theExtendedtypesPackage.getMatcherConfiguration());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(stereotypedElementMatcherConfigurationEClass, StereotypedElementMatcherConfiguration.class, "StereotypedElementMatcherConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getStereotypedElementMatcherConfiguration_StereotypedQualifiedName(), theEcorePackage.getEString(), "stereotypedQualifiedName", null, 0, 1, StereotypedElementMatcherConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,

-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} // StereotypedElementMatcherConfigurationPackageImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationAdapterFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationAdapterFactory.java
deleted file mode 100644
index 79fb441485d..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.util;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

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

-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage

- * @generated

- */

-public class StereotypedElementMatcherConfigurationAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static StereotypedElementMatcherConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StereotypedElementMatcherConfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = StereotypedElementMatcherConfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage) {

-			return true;

-		}

-		if (object instanceof EObject) {

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected StereotypedElementMatcherConfigurationSwitch<Adapter> modelSwitch =

-			new StereotypedElementMatcherConfigurationSwitch<Adapter>() {

-				@Override

-				public Adapter caseStereotypedElementMatcherConfiguration(StereotypedElementMatcherConfiguration object) {

-					return createStereotypedElementMatcherConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter caseMatcherConfiguration(MatcherConfiguration object) {

-					return createMatcherConfigurationAdapter();

-				}

-

-				@Override

-				public Adapter defaultCase(EObject object) {

-					return createEObjectAdapter();

-				}

-			};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param target

-	 *            the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration <em>Stereotyped Element Matcher Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration

-	 * @generated

-	 */

-	public Adapter createStereotypedElementMatcherConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration <em>Matcher Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration

-	 * @generated

-	 */

-	public Adapter createMatcherConfigurationAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // StereotypedElementMatcherConfigurationAdapterFactory

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceFactoryImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceFactoryImpl.java
deleted file mode 100644
index 6f809387adf..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource Factory</b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.util.StereotypedElementMatcherConfigurationResourceImpl

- * @generated

- */

-public class StereotypedElementMatcherConfigurationResourceFactoryImpl extends ResourceFactoryImpl {

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StereotypedElementMatcherConfigurationResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new StereotypedElementMatcherConfigurationResourceImpl(uri);

-		return result;

-	}

-

-} // StereotypedElementMatcherConfigurationResourceFactoryImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceImpl.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceImpl.java
deleted file mode 100644
index 9e14dafb3bd..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationResourceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.util;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource </b> associated with the package.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.util.StereotypedElementMatcherConfigurationResourceFactoryImpl

- * @generated

- */

-public class StereotypedElementMatcherConfigurationResourceImpl extends XMLResourceImpl {

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @param uri

-	 *            the URI of the new resource.

-	 * @generated

-	 */

-	public StereotypedElementMatcherConfigurationResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} // StereotypedElementMatcherConfigurationResourceImpl

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationSwitch.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationSwitch.java
deleted file mode 100644
index 608f2847145..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationSwitch.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.util;

-

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

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.papyrus.infra.extendedtypes.MatcherConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfiguration;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- *

- * @see org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage

- * @generated

- */

-public class StereotypedElementMatcherConfigurationSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected static StereotypedElementMatcherConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StereotypedElementMatcherConfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = StereotypedElementMatcherConfigurationPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Checks whether this is a switch for the given package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @parameter ePackage the package in question.

-	 * @return whether this is a switch for the given package.

-	 * @generated

-	 */

-	@Override

-	protected boolean isSwitchFor(EPackage ePackage) {

-		return ePackage == modelPackage;

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	@Override

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID) {

-		case StereotypedElementMatcherConfigurationPackage.STEREOTYPED_ELEMENT_MATCHER_CONFIGURATION: {

-			StereotypedElementMatcherConfiguration stereotypedElementMatcherConfiguration = (StereotypedElementMatcherConfiguration) theEObject;

-			T result = caseStereotypedElementMatcherConfiguration(stereotypedElementMatcherConfiguration);

-			if (result == null) {

-				result = caseMatcherConfiguration(stereotypedElementMatcherConfiguration);

-			}

-			if (result == null) {

-				result = defaultCase(theEObject);

-			}

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Stereotyped Element Matcher Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Stereotyped Element Matcher Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStereotypedElementMatcherConfiguration(StereotypedElementMatcherConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Matcher Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Matcher Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseMatcherConfiguration(MatcherConfiguration object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 *

-	 * @param object

-	 *            the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	@Override

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // StereotypedElementMatcherConfigurationSwitch

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationXMLProcessor.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationXMLProcessor.java
deleted file mode 100644
index 7d98e16e0e2..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src-gen/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/util/StereotypedElementMatcherConfigurationXMLProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**

- * Copyright (c) 2013 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:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

-import org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration.StereotypedElementMatcherConfigurationPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class StereotypedElementMatcherConfigurationXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public StereotypedElementMatcherConfigurationXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		StereotypedElementMatcherConfigurationPackage.eINSTANCE.eClass();

-	}

-

-	/**

-	 * Register for "*" and "xml" file extensions the StereotypedElementMatcherConfigurationResourceFactoryImpl factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

-			super.getRegistrations();

-			registrations.put(XML_EXTENSION, new StereotypedElementMatcherConfigurationResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new StereotypedElementMatcherConfigurationResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} // StereotypedElementMatcherConfigurationXMLProcessor

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/Activator.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/Activator.java
deleted file mode 100644
index eced410993f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/Activator.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.uml.tools.extendedtypes;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-

-/**

- * This is the central singleton for the ApplyStereotypeActionConfiguration model plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class Activator extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final Activator INSTANCE = new Activator();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public Activator() {

-		super(new ResourceLocator[] {});

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static class Implementation extends EclipsePlugin {

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationModelCreation.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationModelCreation.java
deleted file mode 100644
index 4bceb0a49c2..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionConfigurationModelCreation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 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) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-import org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation;

-

-

-/**

- * {@link IActionConfigurationModelCreation} for {@link ApplyStereotypeActionConfiguration}

- */

-public class ApplyStereotypeActionConfigurationModelCreation implements IActionConfigurationModelCreation<ApplyStereotypeActionConfiguration> {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public ApplyStereotypeActionConfiguration createConfigurationModel() {

-		return ApplyStereotypeActionConfigurationFactory.eINSTANCE.createApplyStereotypeActionConfiguration();

-	}

-}

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionCreationElementValidator.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionCreationElementValidator.java
deleted file mode 100644
index 530240c39be..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionCreationElementValidator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 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) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Profile;

-

-/**

- * @author RS211865

- */

-public class ApplyStereotypeActionCreationElementValidator implements IActionCreationElementValidator<ApplyStereotypeActionConfiguration> {

-

-	protected ApplyStereotypeActionConfiguration configuration;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean canCreate(CreateElementRequest request) {

-		if (configuration == null) {

-			return false;

-		}

-		if (!(request.getContainer() instanceof Element)) {

-			return false;

-		}

-		Element container = (Element) request.getContainer();

-		Package nearestPackage = container.getNearestPackage();

-		if (nearestPackage == null) {

-			return false;

-		}

-		List<Profile> appliedProfiles = nearestPackage.getAllAppliedProfiles();

-		if (appliedProfiles == null) {

-			// no profiles applied, no stereotype can be applied

-			return false;

-		}

-		List<String> appliedProfileNames = new ArrayList<String>();

-		for (Profile profile : appliedProfiles) {

-			appliedProfileNames.add(profile.getQualifiedName());

-		}

-		for (StereotypeToApply stereotypeToApply : configuration.getStereotypesToApply()) {

-			List<String> requiredProfiles = stereotypeToApply.getRequiredProfiles();

-			if (requiredProfiles != null) {

-				for (String requiredProfile : requiredProfiles) {

-					if (!appliedProfileNames.contains(requiredProfile)) {

-						return false;

-					}

-				}

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void init(ApplyStereotypeActionConfiguration configuration) {

-		this.configuration = configuration;

-	}

-}

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionEditHelperAdvice.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionEditHelperAdvice.java
deleted file mode 100644
index 32095344b42..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/ApplyStereotypeActionEditHelperAdvice.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 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) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

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

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

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

-import org.eclipse.papyrus.infra.extendedtypes.IActionEditHelperAdvice;

-import org.eclipse.papyrus.infra.extendedtypes.emf.Activator;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

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

-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.TypedElement;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * advice for the {@link ApplyStereotypeActionConfiguration}

- */

-public class ApplyStereotypeActionEditHelperAdvice extends AbstractEditHelperAdvice implements IActionEditHelperAdvice<ApplyStereotypeActionConfiguration> {

-

-	/** configuration for this edit helper advice */

-	protected ApplyStereotypeActionConfiguration configuration;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void init(ApplyStereotypeActionConfiguration configuration) {

-		this.configuration = configuration;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		return super.approveRequest(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {

-		return super.getBeforeConfigureCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {

-		if (configuration == null) {

-			return null;

-		}

-		ICommand resultCommand = null;

-		// retrieve eobject

-		EObject elementToConfigure = request.getElementToConfigure();

-		if (!(elementToConfigure instanceof Element)) {

-			return null;

-		}

-

-		TransactionalEditingDomain editingDomain = request.getEditingDomain();

-		if (editingDomain == null) {

-			return null;

-		}

-		// retrieve edit service to get features from configure command

-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(elementToConfigure);

-		if (service == null) {

-			Activator.log.error("Impossible to get edit service from element: " + elementToConfigure, null);

-			return null;

-		}

-

-		// for each stereotype, apply stereotype and apply values

-		for (StereotypeToApply stereotypeToApply : configuration.getStereotypesToApply()) {

-			Stereotype stereotype = ((Element) elementToConfigure).getApplicableStereotype(stereotypeToApply.getStereotypeQualifiedName());

-

-			if (stereotype != null) {

-				ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(editingDomain, (Element) elementToConfigure, stereotype, stereotypeToApply.isUpdateName());

-				if (resultCommand == null) {

-					resultCommand = applyStereotypeCommand;

-				} else {

-					resultCommand = resultCommand.compose(applyStereotypeCommand);

-				}

-

-				// apply values

-				for (FeatureToSet featureToSet : stereotypeToApply.getFeaturesToSet()) {

-					// retrieve feature value

-					ICommand command = getSetStereotypeFeatureValueCommand((Element) elementToConfigure, stereotype, featureToSet.getFeatureName(), featureToSet.getValue(), service, request);

-					if (command != null) {

-						if (resultCommand == null) {

-							resultCommand = command;

-						} else {

-							resultCommand = resultCommand.compose(command);

-						}

-					}

-				}

-			}

-

-		}

-

-		if (resultCommand != null) {

-			return resultCommand.reduce();

-		}

-		return super.getAfterConfigureCommand(request);

-	}

-

-	/**

-	 * @param elementToConfigure

-	 *            the eobject to configure

-	 * @param name

-	 *            the name of the feature to set

-	 * @param value

-	 *            the new value of the feature

-	 */

-	protected ICommand getSetStereotypeFeatureValueCommand(Element elementToConfigure, Stereotype stereotype, String name, FeatureValue featureValue, IElementEditService service, ConfigureRequest configureRequest) {

-		if (name == null) {

-			Activator.log.debug("No feature name has been set.");

-			return null;

-		}

-		if (elementToConfigure.eClass() == null) {

-			Activator.log.error("Impossible to find EClass from EObject: " + elementToConfigure, null);

-			return null;

-		}

-

-		if (configureRequest.getEditingDomain() == null) {

-			return null;

-		}

-

-		// retrieve structural feature for the element to configure

-		TypedElement typedElement = (TypedElement) stereotype.getMember(name, true, UMLPackage.eINSTANCE.getTypedElement());

-		if (typedElement == null) {

-			Activator.log.error("Impossible to find feature " + name + " for eobject " + elementToConfigure, null);

-			return null;

-		}

-		Object value = getStereotypeValue(elementToConfigure, stereotype, typedElement.getType(), featureValue);

-

-		return new SetStereotypeValueCommand(configureRequest.getEditingDomain(), elementToConfigure, stereotype, name, value);

-

-	}

-

-

-	/**

-	 * @param elementToConfigure

-	 * @param stereotype

-	 * @param feature

-	 * @param featureValue

-	 * @return

-	 */

-	protected Object getStereotypeValue(Element elementToConfigure, Stereotype stereotype, Type type, FeatureValue featureValue) {

-		return StereotypeFeatureValueUtils.getValue(elementToConfigure, stereotype, type, featureValue);

-	}

-

-

-	public static class ApplyStereotypeCommand extends AbstractTransactionalCommand {

-

-		private Stereotype stereotype;

-

-		private Element element;

-

-		private boolean rename;

-

-		/**

-		 * @param domain

-		 *            editing domain to modify the element

-		 * @param element

-		 *            the element on which stereotype is applied. Must not be <code>null</code>

-		 * @param stereotype

-		 *            the stereotype to modify

-		 * @param rename

-		 */

-		public ApplyStereotypeCommand(TransactionalEditingDomain domain, Element element, Stereotype stereotype, boolean rename) {

-			super(domain, "Apply Stereotype " + stereotype.getLabel(), getWorkspaceFiles(element));

-			this.element = element;

-			this.stereotype = stereotype;

-			this.rename = rename;

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-			try {

-				Object stereotypeApplication = element.applyStereotype(stereotype);

-				if (rename && element instanceof NamedElement) {

-					if (((NamedElement) element).getNamespace() != null) {

-						String newName = NamedElementUtil.getDefaultNameWithIncrementFromBase(stereotype.getName(), ((NamedElement) element).getNamespace().getMembers());

-						((NamedElement) element).setName(newName);

-					}

-				}

-				return CommandResult.newOKCommandResult(stereotypeApplication);

-			} catch (Throwable t) {

-				Activator.log.error(t);

-				return CommandResult.newErrorCommandResult(t.getMessage());

-			}

-		}

-	}

-

-

-	public static class SetStereotypeValueCommand extends AbstractTransactionalCommand {

-

-		private Element element;

-		private Stereotype stereotype;

-		private String featureName;

-		private Object featureValue;

-

-		/**

-		 * Default Constructor

-		 *

-		 * @param domain

-		 *            editing domain to modify the element

-		 * @param element

-		 *            the element on which stereotype is applied. Must not be <code>null</code>

-		 * @param stereotype

-		 *            the stereotype to modify

-		 * @param featureName

-		 *            name of the stereotype feature to modify

-		 * @param featureValue

-		 *            the new value for the stereotype feature value

-		 */

-		public SetStereotypeValueCommand(TransactionalEditingDomain domain, Element element, Stereotype stereotype, String featureName, Object featureValue) {

-			super(domain, "Set stereotype  value " + featureName, getWorkspaceFiles(element.getStereotypeApplication(stereotype)));

-			this.element = element;

-			this.stereotype = stereotype;

-			this.featureName = featureName;

-			this.featureValue = featureValue;

-		}

-

-		/**

-		 * {@inheritDoc}

-		 */

-		@Override

-		protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-			try {

-				element.setValue(stereotype, featureName, featureValue);

-			} catch (Throwable t) {

-				Activator.log.error(t);

-				return CommandResult.newErrorCommandResult(t.getMessage());

-			}

-

-			return CommandResult.newOKCommandResult(element.getValue(stereotype, featureName));

-		}

-

-	}

-}

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeFeatureValueUtils.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeFeatureValueUtils.java
deleted file mode 100644
index b6545a47935..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/applystereotypeactionconfiguration/StereotypeFeatureValueUtils.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 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) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration;

-

-import java.util.ArrayList;

-import java.util.List;

-

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

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

-import org.eclipse.papyrus.infra.extendedtypes.Activator;

-import org.eclipse.papyrus.infra.extendedtypes.emf.converter.ConverterNotfoundException;

-import org.eclipse.papyrus.infra.extendedtypes.emf.converter.ConverterRegistry;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.util.ApplyStereotypeActionConfigurationSwitch;

-import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-

-/**

- * Utility class to get values from a {@link FeatureValue}

- */

-public class StereotypeFeatureValueUtils {

-

-	protected StereotypeFeatureValueUtils() {

-		// no instanciation, helper class

-	}

-

-	/**

-	 * Returns the value to set for a given feature of a given element

-	 *

-	 * @param elementToConfigure

-	 *            eobject for which feature is set. This must not be <code>null</code>

-	 * @param feature

-	 *            {@link EStructuralFeature} to set. This must not be <code>null</code>

-	 * @param valueModel

-	 *            configuration of the value, stored in the model

-	 * @return the real value that will be set to the object or <code>null</code> if none could be computed

-	 */

-	public static Object getValue(final EObject elementToConfigure, final Stereotype stereotype, final Type type, final FeatureValue featureValue) {

-

-		Object result = new ApplyStereotypeActionConfigurationSwitch<Object>() {

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseConstantValue(ConstantValue object) {

-				ValueSpecification valueSpecification = object.getValueInstance();

-

-				if (valueSpecification == null) {

-					return null;

-				}

-

-				try {

-					if (type instanceof PrimitiveType) {

-						final PrimitiveType pType = (PrimitiveType) type;

-						final String name = pType.getName();

-						if (PrimitivesTypesUtils.UML_BOOLEAN.equals(name)) {

-							return ConverterRegistry.getSingleton().convert(boolean.class, valueSpecification);

-						} else if (PrimitivesTypesUtils.UML_INTEGER.equals(name)) {

-							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);

-						} else if (PrimitivesTypesUtils.UML_REAL.equals(name)) {

-							return ConverterRegistry.getSingleton().convert(double.class, valueSpecification);

-						} else if (PrimitivesTypesUtils.UML_STRING.equals(name)) {

-							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

-						} else if (PrimitivesTypesUtils.UML_UNLIMITED_NATURAL.equals(name)) {

-							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);

-						} else { // custom PrimitiveType

-							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

-						}

-					} else if (type instanceof Enumeration) {

-						return ConverterRegistry.getSingleton().convert(Enumeration.class, valueSpecification);

-					} else if (type instanceof DataType) {// FIXME manage the data type

-						return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

-					}

-				} catch (ConverterNotfoundException e) {

-					Activator.log.error("Impossible to convert " + valueSpecification + " to fit feature type :" + type, e);

-				}

-				return super.caseConstantValue(object);

-			}

-

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseQueryExecutionValue(QueryExecutionValue object) {

-				throw new UnsupportedOperationException("Query execution values resolution has not been implemented yet");

-			};

-

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseDynamicValue(DynamicValue object) {

-				throw new UnsupportedOperationException("Dynamic values resolution has not been implemented yet");

-			};

-

-			/**

-			 * {@inheritDoc}

-			 */

-			@Override

-			public Object caseListValue(ListValue object) {

-				// resolve one by one all features in the values list of this listvalue

-				List<Object> results = new ArrayList<Object>();

-				for (FeatureValue value : object.getValues()) {

-					Object singleResult = getValue(elementToConfigure, stereotype, type, value);

-					results.add(singleResult);

-				}

-				return results;

-			};

-

-		}.doSwitch(featureValue);

-		return result;

-	}

-

-

-}

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationModelCreation.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationModelCreation.java
deleted file mode 100644
index 88e7a54b773..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeConfigurationModelCreation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration;
-
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantConfigurationModelCreation;
-
-
-/**
- * @author RS211865
- */
-public class InvariantStereotypeConfigurationModelCreation implements IInvariantConfigurationModelCreation<InvariantStereotypeConfiguration> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public InvariantStereotypeConfiguration createConfigurationModel() {
-		return InvariantStereotypeConfigurationFactory.eINSTANCE.createInvariantStereotypeConfiguration();
-	}
-}
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeCreationElementValidator.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeCreationElementValidator.java
deleted file mode 100644
index dba5b235951..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeCreationElementValidator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantCreationElementValidator;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Profile;
-
-
-
-/**
- * @author RS211865
- */
-public class InvariantStereotypeCreationElementValidator implements IInvariantCreationElementValidator<InvariantStereotypeConfiguration> {
-
-	private String stereotypeQualifiedName;
-	private String requiredProfile;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean canCreate(CreateElementRequest request) {
-		// check basic element type can be created
-
-		// check container is a UML element
-		EObject container = request.getContainer();
-		if (!(container instanceof Element)) {
-			return false;
-		}
-
-		Package nearestPackage = ((Element) container).getNearestPackage();
-		if (nearestPackage == null) {
-			// impossible to check the applied profiles for the container
-			return false;
-		}
-
-		Profile appliedProfile = nearestPackage.getAppliedProfile(requiredProfile, true);
-		return appliedProfile != null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(InvariantStereotypeConfiguration configuration) {
-		stereotypeQualifiedName = configuration.getStereotypeQualifiedName();
-		requiredProfile = configuration.getRequiredProfile();
-
-		if (requiredProfile == null) {
-			// try to find the profile qualified name from the qualified stereotype name
-			requiredProfile = stereotypeQualifiedName.substring(stereotypeQualifiedName.lastIndexOf(NamedElement.SEPARATOR));
-		}
-	}
-}
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeEditHelperAdvice.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeEditHelperAdvice.java
deleted file mode 100644
index bb92eabc16f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeEditHelperAdvice.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantEditHelperAdvice;
-
-
-/**
- * EditHelperAdvice for Stereotype application invariant
- */
-public class InvariantStereotypeEditHelperAdvice extends AbstractEditHelperAdvice implements IInvariantEditHelperAdvice<InvariantStereotypeConfiguration> {
-
-	private String stereotypeQualifiedName;
-
-	/**
-	 *
-	 */
-	public InvariantStereotypeEditHelperAdvice() {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(InvariantStereotypeConfiguration ruleConfiguration) {
-		setStereotypeQualifiedName(ruleConfiguration.getStereotypeQualifiedName());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		// check for stereotype application. Possible in the request system ?!
-		return super.approveRequest(request);
-	}
-
-	/**
-	 * @return the stereotypeQualifiedName
-	 */
-	public String getStereotypeQualifiedName() {
-		return stereotypeQualifiedName;
-	}
-
-	/**
-	 * @param stereotypeQualifiedName
-	 *            the stereotypeQualifiedName to set
-	 */
-	public void setStereotypeQualifiedName(String stereotypeQualifiedName) {
-		this.stereotypeQualifiedName = stereotypeQualifiedName;
-	}
-}
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeElementMatcher.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeElementMatcher.java
deleted file mode 100644
index ab7b2a4bf7a..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/invariantstereotypeconfiguration/InvariantStereotypeElementMatcher.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2014 CEA LIST 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) - Initial API and implementation
- *  Sebastien Gabel (Esterel Technologies) - Add support to isStrict attribute  
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.extendedtypes.invariantstereotypeconfiguration;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.extendedtypes.invariantsemantictypeconfiguration.IInvariantElementMatcher;
-import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Stereotype;
-
-
-/**
- * @author RS211865
- */
-public class InvariantStereotypeElementMatcher implements IInvariantElementMatcher<InvariantStereotypeConfiguration> {
-
-	private String stereotypeQualifiedName;
-
-	private boolean isStrict;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean matches(EObject eObject) {
-
-		if (!(eObject instanceof Element)) {
-			return false;
-		}
-
-		String stereotypeQualifiedName = getStereotypeQualifiedName();
-		if(stereotypeQualifiedName==null) { // to avoid null pointers
-			return false;
-		}
-		Stereotype appliedStereotype = ((Element) eObject).getAppliedStereotype(stereotypeQualifiedName);
-		if (appliedStereotype != null) { // one has been found, no need to get further
-			return true; 
-		} else if(!isStrict) { // the stereotype does not match perfectly, but one of the applied stereotypes on the element could match if not strict
-			for (Stereotype stereotype : ((Element) eObject).getAppliedStereotypes()) { 
-				for (Stereotype superStereotype : StereotypeUtil.getAllSuperStereotypes(stereotype)) {
-					if (stereotypeQualifiedName.equals(superStereotype.getQualifiedName())) {
-						return true; // there is a match in the super stereotypes. Finish here, element matches
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void init(InvariantStereotypeConfiguration ruleConfiguration) {
-		setStereotypeQualifiedName(ruleConfiguration.getStereotypeQualifiedName());
-		setStrict(ruleConfiguration.isStrict());
-	}
-
-	/**
-	 * @return the stereotypeQualifiedName
-	 */
-	public String getStereotypeQualifiedName() {
-		return stereotypeQualifiedName;
-	}
-
-	/**
-	 * @param stereotypeQualifiedName
-	 *            the stereotypeQualifiedName to set
-	 */
-	public void setStereotypeQualifiedName(String stereotypeQualifiedName) {
-		this.stereotypeQualifiedName = stereotypeQualifiedName;
-	}
-
-
-	/**
-	 * @return the isStrict
-	 */
-	public boolean isStrict() {
-		return isStrict;
-	}
-
-	/**
-	 * @param isStrict
-	 *            the isStrict to set
-	 */
-	public void setStrict(boolean isStrict) {
-		this.isStrict = isStrict;
-	}
-}
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfigurationModelCreation.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfigurationModelCreation.java
deleted file mode 100644
index f04d3da391b..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionConfigurationModelCreation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 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) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration;

-

-import org.eclipse.papyrus.infra.extendedtypes.IActionConfigurationModelCreation;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;

-

-

-/**

- * {@link IActionConfigurationModelCreation} for {@link ApplyStereotypeActionConfiguration}

- */

-public class SetTypeActionConfigurationModelCreation implements IActionConfigurationModelCreation<SetTypeActionConfiguration> {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public SetTypeActionConfiguration createConfigurationModel() {

-		return SetTypeActionConfigurationFactory.eINSTANCE.createSetTypeActionConfiguration();

-	}

-}

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionCreationElementValidator.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionCreationElementValidator.java
deleted file mode 100644
index 60a2f7b1e0f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionCreationElementValidator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 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) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration;

-

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.extendedtypes.IActionCreationElementValidator;

-

-/**

- * {@link IActionCreationElementValidator} for {@link SetTypeActionConfiguration}

- */

-public class SetTypeActionCreationElementValidator implements IActionCreationElementValidator<SetTypeActionConfiguration> {

-

-	protected SetTypeActionConfiguration configuration;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean canCreate(CreateElementRequest request) {

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void init(SetTypeActionConfiguration configuration) {

-		this.configuration = configuration;

-	}

-}

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionEditHelperAdvice.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionEditHelperAdvice.java
deleted file mode 100644
index eada1c34007..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/settypeactionconfiguration/SetTypeActionEditHelperAdvice.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 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) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.extendedtypes.settypeactionconfiguration;

-

-import java.util.Arrays;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

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

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

-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

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

-import org.eclipse.papyrus.infra.extendedtypes.IActionEditHelperAdvice;

-import org.eclipse.papyrus.infra.extendedtypes.emf.Activator;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

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

-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

-import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement;

-import org.eclipse.papyrus.uml.tools.extendedtypes.applystereotypeactionconfiguration.ApplyStereotypeActionConfiguration;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.uml2.uml.Element;

-

-/**

- * advice for the {@link ApplyStereotypeActionConfiguration}

- */

-public class SetTypeActionEditHelperAdvice extends AbstractEditHelperAdvice implements IActionEditHelperAdvice<SetTypeActionConfiguration> {

-

-	/** configuration for this edit helper advice */

-	protected SetTypeActionConfiguration configuration;

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void init(SetTypeActionConfiguration configuration) {

-		this.configuration = configuration;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		return super.approveRequest(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {

-		return super.getBeforeConfigureCommand(request);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {

-		if (configuration == null) {

-			return null;

-		}

-		ICommand resultCommand = null;

-		// retrieve eobject

-		final EObject elementToConfigure = request.getElementToConfigure();

-		if (!(elementToConfigure instanceof Element)) {

-			return null;

-		}

-

-		final TransactionalEditingDomain editingDomain = request.getEditingDomain();

-		if (editingDomain == null) {

-			return null;

-		}

-		// retrieve edit service to get features from configure command

-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(elementToConfigure);

-		if (service == null) {

-			Activator.log.error("Impossible to get edit service from element: " + elementToConfigure, null);

-			return null;

-		}

-

-		resultCommand = new AbstractTransactionalCommand(editingDomain, "Editing type", Arrays.asList((WorkspaceSynchronizer.getFile(elementToConfigure.eResource())))) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				UMLModelElement umlModelElement = new UMLModelElement(elementToConfigure, editingDomain);

-				ReferenceValueFactory factory = umlModelElement.getValueFactory("type");

-				Object elemObject = factory.edit(Display.getDefault().getFocusControl(), elementToConfigure);

-				return CommandResult.newOKCommandResult(elemObject);

-			}

-		};

-

-		return resultCommand;

-	}

-

-	/**

-	 * @return

-	 */

-	protected EObject getDefaultTypeContainer(ConfigureRequest request) {

-		if (request.getElementToConfigure() instanceof Element) {

-			return ((Element) request.getElementToConfigure()).getNearestPackage();

-		}

-		return request.getElementToConfigure().eContainer();

-	}

-

-

-}

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcher.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcher.java
deleted file mode 100644
index 8af5084972f..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcher.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.infra.extendedtypes.IConfigurableElementMatcher;
-import org.eclipse.uml2.uml.Element;
-
-
-/**
- * Matcher for UML elements that should be stereotypes
- */
-public class StereotypedElementMatcher implements IConfigurableElementMatcher<StereotypedElementMatcherConfiguration> {
-
-	private String stereotypedQualifiedName;
-
-	/**
-	 * @param stereotypedQualifiedName
-	 */
-	public StereotypedElementMatcher(StereotypedElementMatcherConfiguration configuration) {
-		this.setStereotypedQualifiedName(configuration.getStereotypedQualifiedName());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean matches(EObject eObject) {
-		if (!(eObject instanceof Element)) {
-			return false;
-		}
-
-		return ((Element) eObject).getAppliedStereotype(getStereotypedQualifiedName()) != null;
-
-	}
-
-	/**
-	 * @return the stereotypedQualifiedName
-	 */
-	public String getStereotypedQualifiedName() {
-		return stereotypedQualifiedName;
-	}
-
-	/**
-	 * @param stereotypedQualifiedName
-	 *            the stereotypedQualifiedName to set
-	 */
-	public void setStereotypedQualifiedName(String stereotypedQualifiedName) {
-		this.stereotypedQualifiedName = stereotypedQualifiedName;
-	}
-
-}
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherFactory.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherFactory.java
deleted file mode 100644
index 0aaa4c5c24a..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration;
-
-import org.eclipse.papyrus.infra.extendedtypes.IConfigurableElementMatcherFactory;
-
-
-/**
- * Factory to create matcher based on stereotypes applied on the element
- */
-public class StereotypedElementMatcherFactory implements IConfigurableElementMatcherFactory<StereotypedElementMatcherConfiguration> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public StereotypedElementMatcher createElementMatcher(StereotypedElementMatcherConfiguration configuration) {
-		return new StereotypedElementMatcher(configuration);
-	}
-}
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherModelCreation.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherModelCreation.java
deleted file mode 100644
index a7984228fbb..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.extendedtypes/src/org/eclipse/papyrus/uml/tools/extendedtypes/stereotypedelementmatcherconfiguration/StereotypedElementMatcherModelCreation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 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) - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.extendedtypes.stereotypedelementmatcherconfiguration;
-
-import org.eclipse.papyrus.infra.extendedtypes.IElementMatcherConfigurationModelCreation;
-
-
-/**
- * Factory in charge of the creation of a new element matcher
- */
-public class StereotypedElementMatcherModelCreation implements IElementMatcherConfigurationModelCreation<StereotypedElementMatcherConfiguration> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public StereotypedElementMatcherConfiguration createConfigurationModel() {
-		return StereotypedElementMatcherConfigurationFactory.eINSTANCE.createStereotypedElementMatcherConfiguration();
-	}
-}
diff --git a/plugins/uml/tools/pom.xml b/plugins/uml/tools/pom.xml
index 1478d1e3614..a9cb309e4b8 100644
--- a/plugins/uml/tools/pom.xml
+++ b/plugins/uml/tools/pom.xml
@@ -13,7 +13,6 @@
 
 	<modules>
 		<module>org.eclipse.papyrus.uml.tools</module>
-		<module>org.eclipse.papyrus.uml.tools.extendedtypes</module>
 		<module>org.eclipse.papyrus.uml.tools.utils</module>
 	</modules>
 </project>