30 files changed, 0 insertions, 2394 deletions
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.classpath b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.classpath
deleted file mode 100644
index b1dabee3829..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.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/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.project b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.project
deleted file mode 100644
index 0fb8960ce36..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.adl4eclipsetool.assistant</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.settings/org.eclipse.jdt.core.prefs b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 09d35d569cc..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.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.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-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.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/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/.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/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF
deleted file mode 100644
index 84668ba18f2..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.adltool.assistant,
- org.eclipse.papyrus.adltool.assistant.wizard
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf,
- org.eclipse.emf.ecore,
- org.eclipse.emf.transaction,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.adl4eclipsetool;bundle-version="1.1.0",
- org.eclipse.pde.core,
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.papyrus.adl4eclipse.profile,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.osgi.profile,
- org.eclipse.core.expressions;bundle-version="3.5.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.adltool.assistant.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: This plugin has in charge to connect the tool to model eclipse plugins withe the eclipse UI. The plugins that allow the modelization is or.eclipse.papyrus.adl4eclipsetool. More details can be found in the docs directory of or.eclipse.papyrus.adl4eclipsetool.
-Bundle-SymbolicName: org.eclipse.papyrus.adl4eclipsetool.assistant;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/about.html b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/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/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/build.properties b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/build.properties
deleted file mode 100644
index 1cdb4a0350c..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               resources/,\
-               img/,\
-               about.html
-src.includes = about.html
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/icons/sample.gif b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/icons/sample.gif
deleted file mode 100644
index 34fb3c9d8cb..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/icons/sample.gif
+++ /dev/null
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/img/adl.png b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/img/adl.png
deleted file mode 100644
index 597790b0c2d..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/img/adl.png
+++ /dev/null
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/img/adl.svg b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/img/adl.svg
deleted file mode 100644
index bffe0c3e0f5..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/img/adl.svg
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="460.62991"
-   height="283.46457"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="papyrus.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1306"
-     inkscape:window-height="767"
-     id="namedview53"
-     showgrid="false"
-     inkscape:zoom="0.76200001"
-     inkscape:cx="176.05836"
-     inkscape:cy="233.31647"
-     inkscape:window-x="493"
-     inkscape:window-y="93"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3908">
-      <stop
-         style="stop-color:#1a171a;stop-opacity:1;"
-         offset="0"
-         id="stop3910" />
-      <stop
-         style="stop-color:#9c9e9f;stop-opacity:1;"
-         offset="1"
-         id="stop3912" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3818">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3820" />
-      <stop
-         style="stop-color:#98bf06;stop-opacity:1;"
-         offset="1"
-         id="stop3822" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3818"
-       id="radialGradient3832"
-       cx="622.66229"
-       cy="107.15185"
-       fx="622.66229"
-       fy="107.15185"
-       r="125.38313"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3818-1"
-       id="radialGradient3832-3"
-       cx="622.66229"
-       cy="107.15185"
-       fx="622.66229"
-       fy="107.15185"
-       r="125.38313"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3818-1">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3820-6" />
-      <stop
-         style="stop-color:#009bba;stop-opacity:1;"
-         offset="1"
-         id="stop3822-8" />
-    </linearGradient>
-    <radialGradient
-       r="125.38313"
-       fy="107.15185"
-       fx="622.66229"
-       cy="107.15185"
-       cx="622.66229"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3849"
-       xlink:href="#linearGradient3818-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3914"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3916"
-       gradientUnits="userSpaceOnUse"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3918"
-       gradientUnits="userSpaceOnUse"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3920"
-       gradientUnits="userSpaceOnUse"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3922"
-       gradientUnits="userSpaceOnUse"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3925"
-       gradientUnits="userSpaceOnUse"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893"
-       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3928"
-       gradientUnits="userSpaceOnUse"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893"
-       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3931"
-       gradientUnits="userSpaceOnUse"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893"
-       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3934"
-       gradientUnits="userSpaceOnUse"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893"
-       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3940"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3946"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3952"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3958"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3818-1"
-       id="radialGradient3970"
-       gradientUnits="userSpaceOnUse"
-       cx="622.66229"
-       cy="107.15185"
-       fx="622.66229"
-       fy="107.15185"
-       r="125.38313" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3818"
-       id="radialGradient3972"
-       gradientUnits="userSpaceOnUse"
-       cx="622.66229"
-       cy="107.15185"
-       fx="622.66229"
-       fy="107.15185"
-       r="125.38313" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3974"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3976"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3978"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3980"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
-       x1="549.05366"
-       y1="177.90893"
-       x2="824.32955"
-       y2="177.90893" />
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-768.89631)"
-     id="layer2" />
-  <g
-     id="g3960"
-     transform="matrix(0.93318676,0,0,0.93318676,8.4148818,11.649074)"
-     inkscape:export-xdpi="5.8753209"
-     inkscape:export-ydpi="5.8753209">
-    <path
-       d="m 796.19109,174.89305 c 0,65.08738 -52.76374,117.85113 -117.85112,117.85113 -65.08738,0 -117.85113,-52.76375 -117.85113,-117.85113 0,-65.08738 52.76375,-117.851126 117.85113,-117.851126 65.08738,0 117.85112,52.763746 117.85112,117.851126 z"
-       sodipodi:ry="117.85113"
-       sodipodi:rx="117.85113"
-       sodipodi:cy="174.89305"
-       sodipodi:cx="678.33997"
-       id="path3030-8"
-       style="opacity:0.98999999;fill:url(#radialGradient3970);fill-opacity:1;stroke:none"
-       sodipodi:type="arc"
-       transform="translate(-451.91733,-35.262539)" />
-    <path
-       transform="translate(-437.79032,-35.262539)"
-       d="m 796.19109,174.89305 c 0,65.08738 -52.76374,117.85113 -117.85112,117.85113 -65.08738,0 -117.85113,-52.76375 -117.85113,-117.85113 0,-65.08738 52.76375,-117.851126 117.85113,-117.851126 65.08738,0 117.85112,52.763746 117.85112,117.851126 z"
-       sodipodi:ry="117.85113"
-       sodipodi:rx="117.85113"
-       sodipodi:cy="174.89305"
-       sodipodi:cx="678.33997"
-       id="path3030"
-       style="opacity:0.98999999;fill:url(#radialGradient3972);fill-opacity:1;stroke:none"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path3868"
-       d="m 125.32217,164.47792 c 0.48084,2.47664 1.1607,4.92485 1.82692,7.375 l 244.0633,0 0,-7.375 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3974);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path3868-2"
-       d="m 122.84277,145.44667 c 0.0647,2.45833 0.31139,4.91667 0.56547,7.375 l 247.80415,0 0,-7.375 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3976);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path3868-7"
-       d="m 123.42274,126.44667 c -0.33255,2.44792 -0.44679,4.89583 -0.59447,7.34375 l 248.38412,0 0,-7.34375 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3978);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path3868-71"
-       d="m 127.14909,107.41542 c -0.76224,2.48347 -1.29841,4.92927 -1.83417,7.375 l 245.89747,0 0,-7.375 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3980);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-  </g>
-</svg>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.properties b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.properties
deleted file mode 100644
index fd4797847a3..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.properties
+++ /dev/null
@@ -1,14 +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:
-#     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
-##################################################################################
-pluginName=ADL4eclipseTool Assistant (Incubation)
-providerName=Eclipse Modeling Project
-
-pluginDescription=This plugin has in charge to connect the tool to model eclipse plugins withe the eclipse UI.&#xD;&#xA;The plugins that allow the modelization is or.eclipse.papyrus.adl4eclipsetool. More details can be found in the docs directory of or.eclipse.papyrus.adl4eclipsetool.
-\ No newline at end of file
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
deleted file mode 100644
index 9455982cbe7..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-     <extension
-         point="org.eclipse.ui.startup">
-      <startup
-            class="org.eclipse.papyrus.adltool.assistant.Activator"></startup>
-   </extension>
-     <extension
-           point="org.eclipse.ui.importWizards">
-        <category
-              id="org.eclipse.papyrus.editor.category"
-              name="Papyrus">
-        </category>
-        <wizard
-              category="org.eclipse.papyrus.editor.category"
-              class="org.eclipse.papyrus.adl4eclipsetool.assistant.SimplePluginImport"
-              icon="img/adl.png"
-              id="org.eclipse.papyrus.adl4eclipsetool.assistant.simplePluginsWizard"
-              name="Workspace plug-ins architecture snapshot">
-        </wizard>
-        <wizard
-              category="org.eclipse.papyrus.editor.category"
-              class="org.eclipse.papyrus.adl4eclipsetool.assistant.AdvancePluginImport"
-              icon="img/adl.png"
-              id="org.eclipse.papyrus.adl4eclipsetool.assistant.advancedPluginsWizard"
-              name="Platform plug-ins architecture snapshot (advanced)">
-        </wizard>
-        <wizard
-              category="org.eclipse.papyrus.editor.category"
-              class="org.eclipse.papyrus.adl4eclipsetool.assistant.SimpleFeatureImport"
-              icon="img/adl.png"
-              id="org.eclipse.papyrus.adl4eclipsetool.assistant.simpleFeaturesWizard"
-              name="Workspace features architecture snapshot">
-        </wizard>
-        <wizard
-              category="org.eclipse.papyrus.editor.category"
-              class="org.eclipse.papyrus.adl4eclipsetool.assistant.AdvanceFeatureImport"
-              icon="img/adl.png"
-              id="org.eclipse.papyrus.adl4eclipsetool.assistant.advancedFeaturesWizard"
-              name="Platform features architecture snapshot (advanced)">
-        </wizard>
-        <wizard
-              category="org.eclipse.papyrus.editor.category"
-              class="org.eclipse.papyrus.adl4eclipsetool.assistant.CompleteImport"
-              icon="img/adl.png"
-              id="org.eclipse.papyrus.adl4eclipsetool.assistant.completeWizard"
-              name="Complete platform architecture snapshot">
-        </wizard>
-     </extension>
-     <extension
-           point="org.eclipse.papyrus.uml.diagram.wizards.templates">
-        <template
-              di_file="resources/model.di"
-              file="resources/model.uml"
-              id="org.eclipse.papyrus.adl4eclipsetool.assistant.templateWithProfiles"
-              language="uml"
-              name="An Architecture Model (with OSGi and ADL profiles)"
-              notation_file="resources/model.notation">
-        </template>
-     </extension>
-     <extension
-           point="org.eclipse.ui.commands">
-        <category
-              id="org.eclipse.papyrus.adl4eclipsetool.assistant.commands.category"
-              name="ADL4Eclipse Refactoring Category">
-        </category>
-        <command
-              categoryId="org.eclipse.papyrus.adl4eclipsetool.assistant.commands.category"
-              id="org.eclipse.papyrus.adl4eclipsetool.assistant.commands.ModelRefactoringCommand"
-              name="Model Refactoring Command">
-        </command>
-     </extension>
-     <extension
-            point="org.eclipse.core.expressions.propertyTesters">
-         <propertyTester
-               class="org.eclipse.papyrus.adl4eclipsetool.assistant.handlers.ArchitectureModelPropertyTester"
-               id="org.eclipse.papyrus.adl4eclipsetool.assistant.menu.tester"
-               namespace="org.eclipse.papyrus.adl4eclipsetool.assistant.menu.tester"
-               properties="isArchitectureModel"
-               type="org.eclipse.jface.viewers.IStructuredSelection">
-         </propertyTester>
-      </extension>
-     <extension
-           point="org.eclipse.ui.handlers">
-        <handler
-              class="org.eclipse.papyrus.adl4eclipsetool.assistant.handlers.ModelRefactoringHandler"
-              commandId="org.eclipse.papyrus.adl4eclipsetool.assistant.commands.ModelRefactoringCommand">
-           <enabledWhen>
-              <and>
-                 <with
-                       variable="selection">
-                    <test
-                          forcePluginActivation="true"
-                          property="org.eclipse.papyrus.adl4eclipsetool.assistant.menu.tester.isArchitectureModel"
-                          value="true">
-                    </test>
-                 </with>
-              </and>
-           </enabledWhen>
-        </handler>
-     </extension>
-      <extension
-         point="org.eclipse.ui.menus">
-     <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.papyrus.uml.modelrepair.refactor?after=additions">
-         <command
-               commandId="org.eclipse.papyrus.adl4eclipsetool.assistant.commands.ModelRefactoringCommand"
-               icon="img/adl.png"
-               id="org.eclipse.papyrus.adl4eclipsetool.assistant.menus.ModelRefactoringCommand"
-               mnemonic="S">
-         </command>
-        </menuContribution>
-     </extension>
-</plugin>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/pom.xml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/pom.xml
deleted file mode 100644
index 3ac2cc32b23..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.extra.releng</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-		<relativePath>../../../releng/extra</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.adl4eclipsetool.assistant</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<version>1.2.0-SNAPSHOT</version>
-	<groupId>org.eclipse.papyrus</groupId>
-</project>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/resources/model.di b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/resources/model.di
deleted file mode 100644
index bf9abab340f..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/resources/model.di
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/resources/model.notation b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/resources/model.notation
deleted file mode 100644
index bf9abab340f..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/resources/model.notation
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/resources/model.uml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/resources/model.uml
deleted file mode 100644
index 902f77dfe11..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/resources/model.uml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_dwpjEOqLEeO3GfcVE7U8Ug" name="Architecture">
-  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_jhQz4DEOEeWwePMzasfCCQ">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jF-G0LRnEeW6-IpZ5uv1Sg" source="PapyrusVersion">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-G0bRnEeW6-IpZ5uv1Sg" key="Version" value="0.0.31"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-G0rRnEeW6-IpZ5uv1Sg" key="Comment" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-G07RnEeW6-IpZ5uv1Sg" key="Copyright" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-G1LRnEeW6-IpZ5uv1Sg" key="Date" value="2015-09-04"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-G1bRnEeW6-IpZ5uv1Sg" key="Author" value=""/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jhRa8DEOEeWwePMzasfCCQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <references xmi:type="ecore:EPackage" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_WxCw4FMUEeWmCZVdWNq14A"/>
-    </eAnnotations>
-    <appliedProfile xmi:type="uml:Profile" href="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml#_nE1m0Hz7EeKfO4elN3J5Fw"/>
-  </profileApplication>
-  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_jhSCBjEOEeWwePMzasfCCQ">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jF-t4LRnEeW6-IpZ5uv1Sg" source="PapyrusVersion">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-t4bRnEeW6-IpZ5uv1Sg" key="Version" value="0.0.30"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-t4rRnEeW6-IpZ5uv1Sg" key="Comment" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-t47RnEeW6-IpZ5uv1Sg" key="Copyright" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-t5LRnEeW6-IpZ5uv1Sg" key="Date" value="2015-09-01"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-t5bRnEeW6-IpZ5uv1Sg" key="Author" value=""/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jhSCBzEOEeWwePMzasfCCQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <references xmi:type="ecore:EPackage" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_vESkQFChEeWCedWm4kJ8pQ"/>
-    </eAnnotations>
-    <appliedProfile xmi:type="uml:Profile" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_OKU8EHtxEeKcL-wrhM9ICg"/>
-  </profileApplication>
-  <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_jhSpFjEOEeWwePMzasfCCQ">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jF-t5rRnEeW6-IpZ5uv1Sg" source="PapyrusVersion">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-t57RnEeW6-IpZ5uv1Sg" key="Version" value="0.0.30"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-t6LRnEeW6-IpZ5uv1Sg" key="Comment" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-t6bRnEeW6-IpZ5uv1Sg" key="Copyright" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-t6rRnEeW6-IpZ5uv1Sg" key="Date" value="2015-09-01"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jF-t67RnEeW6-IpZ5uv1Sg" key="Author" value=""/>
-    </eAnnotations>
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jhSpFzEOEeWwePMzasfCCQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <references xmi:type="ecore:EPackage" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_vEf_oFChEeWCedWm4kJ8pQ"/>
-    </eAnnotations>
-    <appliedProfile xmi:type="uml:Profile" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_YbhfEHtxEeKcL-wrhM9ICg"/>
-  </profileApplication>
-</uml:Model>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AbstractImportWizard.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AbstractImportWizard.java
deleted file mode 100644
index 70594a78fdc..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AbstractImportWizard.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 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:
- *  Thomas Daniellou (CEA LIST) - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.adl4eclipsetool.assistant;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.papyrus.adl4eclipse.org.ADL4Eclipse_Stereotypes;
-import org.eclipse.papyrus.adltool.ADL4EclipseUtils;
-import org.eclipse.papyrus.adltool.assistant.wizard.BundleSelectionPage;
-import org.eclipse.papyrus.adltool.command.CompleteArchitectureSnapshotCommand;
-import org.eclipse.papyrus.adltool.designer.ReverseSettings;
-import org.eclipse.papyrus.adltool.reversible.project.ReversibleProject;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
-import org.eclipse.papyrus.osgi.profile.OSGIStereotypes;
-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Profile;
-
-/**
- * This abstract class specifies the default functionality of the import wizard
- * used to launch a reverse on a set of
- * {@link org.eclipse.papyrus.adltool.reversible.project.ReversibleProject
- * ReversibleProject}.
- *
- * <p>
- * <b>Note</b>: In order to extend this abstract class, the user needs to
- * initialize the {@link #reversibleList} field and implement the
- * {@link #performFinish()} method.
- * </p>
- */
-public abstract class AbstractImportWizard extends Wizard implements IImportWizard {
-
-	/**
-	 * The list of reversible projects to be displayed in the
-	 * {@link org.eclipse.papyrus.adltool.assistant.wizard.BundleSelectionPage
-	 * BundleSelectionPage}.
-	 */
-	protected Set<ReversibleProject> reversibleList;
-
-	/**
-	 * Whether the import wizard is in "Advanced mode" or not.
-	 */
-	protected boolean advanced;
-
-	/**
-	 * The Wizard page that will help selecting bundles or features to import
-	 * for the reverse engineering.
-	 */
-	protected BundleSelectionPage bundleSelectionPage;
-
-	/**
-	 * The object used to perform transactions on the models.
-	 */
-	protected TransactionalEditingDomain transactionalEditingDomain;
-
-	/**
-	 * The service used to access the Papyrus' models.
-	 */
-	protected ModelSet modelSet;
-
-	/**
-	 * The command used to launch the reverse.
-	 */
-	protected RecordingCommand command;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param advanced
-	 *            true to launch the wizard in advanced mode.
-	 */
-	public AbstractImportWizard(boolean advanced) {
-		super();
-		setNeedsProgressMonitor(true);
-
-		this.advanced = advanced;
-	}
-
-	@Override
-	public void addPages() {
-		addPage(bundleSelectionPage);
-	}
-
-	@Override
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		reversibleList = getReversibleList();
-		bundleSelectionPage = new BundleSelectionPage(reversibleList, advanced);
-
-		Package rootModel = null;
-		Object selectedModel = selection.getFirstElement();
-
-		if (selectedModel instanceof ModelEditPart) {
-			// Get the root model from the diagram view
-			EObject element = ((ModelEditPart) selectedModel).getDiagramView().getElement();
-
-			if (element instanceof Model) {
-				rootModel = (Model) element;
-			}
-		} else {
-			// Get the root model from the selection
-			List<Element> selectionSet = getSelectionSet();
-
-			if (!selectionSet.isEmpty()) {
-				Element selectedElement = selectionSet.get(0);
-
-				rootModel = ADL4EclipseUtils.getRootModel(selectedElement);
-			} else {
-				bundleSelectionPage.setErrorMessage("You must select a Papyrus Model before running the import.");
-			}
-		}
-
-		if (rootModel != null && !rootModel.isModelLibrary()) {
-			// Check if the required profiles are applied to the rootModel to
-			// initialize the modelSet
-			Profile adlProfile = rootModel.getAppliedProfile(ADL4Eclipse_Stereotypes.ADL4ECLIPSE);
-			Profile osgiProfile = rootModel.getAppliedProfile(OSGIStereotypes.OSGI);
-
-			if (adlProfile == null && osgiProfile == null) {
-				bundleSelectionPage
-						.setMessage("Info: The selected model does not have the ADL and OSGI profiles applied.");
-			}
-
-			try {
-				// Initialize the modelSet and the TransactionalEditingDomain
-				modelSet = ServiceUtilsForResource.getInstance().getModelSet(rootModel.eResource());
-				transactionalEditingDomain = modelSet.getTransactionalEditingDomain();
-				bundleSelectionPage.setSelectedModel(rootModel);
-			} catch (ServiceException e) {
-				e.printStackTrace();
-			}
-
-		}
-	}
-
-	/**
-	 * Gets the selected element in the diagram or in the model explorer.
-	 *
-	 * @return Element or null
-	 */
-	protected List<Element> getSelectionSet() {
-		List<Element> selectedSet = new ArrayList<>();
-		ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
-		ISelection selection = selectionService.getSelection();
-
-		if (selection instanceof IStructuredSelection) {
-			Iterator<?> selectedobjectIteractor = ((IStructuredSelection) selection).iterator();
-
-			while (selectedobjectIteractor.hasNext()) {
-				Object currentSelection = selectedobjectIteractor.next();
-				EObject selectedEObject = EMFHelper.getEObject(currentSelection);
-
-				if (selectedEObject instanceof Element) {
-					selectedSet.add((Element) selectedEObject);
-				}
-			}
-		}
-
-		return selectedSet;
-	}
-
-	@Override
-	public boolean canFinish() {
-		return bundleSelectionPage.isPageComplete();
-	}
-
-	/**
-	 * Gets the selected reversible project from the
-	 * {@link org.eclipse.papyrus.adltool.assistant.wizard.BundleSelectionPage
-	 * BundleSelectionPage} and launches the architecture snapshot command that
-	 * will reverse the projects.
-	 *
-	 * @return true if the command has launched, false if not
-	 */
-	@Override
-	public boolean performFinish() {
-		final Set<ReversibleProject> selectedBundles = bundleSelectionPage.getResult();
-
-		// One bundle must be selected
-		if (selectedBundles.size() > 0) {
-			final Package selection = bundleSelectionPage.getSelectedModel();
-
-			if (selection != null) {
-				final ReverseSettings reverseSettings = bundleSelectionPage.getReverseSettings();
-				Job importJob = new Job("Import") {
-
-					@Override
-					protected IStatus run(IProgressMonitor monitor) {
-						// Launch the advanced reverse engineering
-						command = new CompleteArchitectureSnapshotCommand(transactionalEditingDomain, selection,
-								selectedBundles, reverseSettings);
-						monitor.worked(1);
-						transactionalEditingDomain.getCommandStack().execute(command);
-						Display.getDefault().asyncExec(new Runnable() {
-							public void run() {
-								MessageDialog.openInformation(getShell(), "Import finished", "Import is finished on "+ selectedBundles.size() +" bundles.");
-							}
-						});
-						return Status.OK_STATUS;
-					}
-				};
-				importJob.schedule();
-
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	protected abstract Set<ReversibleProject> getReversibleList();
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvanceFeatureImport.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvanceFeatureImport.java
deleted file mode 100644
index abd1327f935..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvanceFeatureImport.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 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:
- *  Thomas Daniellou (CEA LIST) - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.adl4eclipsetool.assistant;
-
-import java.util.Set;
-
-import org.eclipse.papyrus.adltool.ADL4EclipseUtils;
-import org.eclipse.papyrus.adltool.reversible.project.ReversibleProject;
-
-public class AdvanceFeatureImport extends AbstractImportWizard {
-	private static boolean ADVANCED_MODE = true;
-
-	public AdvanceFeatureImport() {
-		super(ADVANCED_MODE);
-	}
-
-	@Override
-	protected Set<ReversibleProject> getReversibleList() {
-		return ADL4EclipseUtils.getReversibleFeatures();
-	}
-
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java
deleted file mode 100644
index 54284fd12ec..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java
+++ /dev/null
@@ -1,37 +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:
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.adl4eclipsetool.assistant;
-
-import java.util.Set;
-
-import org.eclipse.papyrus.adltool.ADL4EclipseUtils;
-import org.eclipse.papyrus.adltool.reversible.project.ReversibleProject;
-
-/**
- * This class is used to do the reverse engineering from workspace plug-in. It adds only in the platform dependencies.
- */
-public class AdvancePluginImport extends AbstractImportWizard {
-
-	private static final boolean ADVANCED_MODE = true;
-
-	public AdvancePluginImport() {
-		super(ADVANCED_MODE);
-	}
-
-	@Override
-	protected Set<ReversibleProject> getReversibleList() {
-		return ADL4EclipseUtils.getLoadedPlugins();
-		//return ADL4EclipseUtils.getReversiblePlugins();
-	}
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/CompleteImport.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/CompleteImport.java
deleted file mode 100644
index b0089fa7861..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/CompleteImport.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 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:
- *  Thomas Daniellou (CEA LIST) - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.adl4eclipsetool.assistant;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.papyrus.adltool.ADL4EclipseUtils;
-import org.eclipse.papyrus.adltool.reversible.project.ReversibleProject;
-
-public class CompleteImport extends AbstractImportWizard {
-
-	private static final boolean ADVANCED_MODE = true;
-
-	public CompleteImport() {
-		super(ADVANCED_MODE);
-	}
-
-	@Override
-	protected Set<ReversibleProject> getReversibleList() {
-		Set<ReversibleProject> reversibleList = new HashSet<>();
-
-		reversibleList.addAll(ADL4EclipseUtils.getReversibleFeatures());
-		reversibleList.addAll(ADL4EclipseUtils.getLoadedPlugins());
-		reversibleList.addAll(ADL4EclipseUtils.getWorkspacePlugins());
-
-		return reversibleList;
-	}
-
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/SimpleFeatureImport.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/SimpleFeatureImport.java
deleted file mode 100644
index 489aac5d9df..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/SimpleFeatureImport.java
+++ /dev/null
@@ -1,36 +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:
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.adl4eclipsetool.assistant;
-
-import java.util.Set;
-
-import org.eclipse.papyrus.adltool.ADL4EclipseUtils;
-import org.eclipse.papyrus.adltool.reversible.project.ReversibleProject;
-
-/**
- * This class is used to do the reverse engineering from workspace feature. It adds only in the platform dependencies.
- */
-public class SimpleFeatureImport extends AbstractImportWizard {
-
-	private static final boolean ADVANCED_MODE = false;
-
-	public SimpleFeatureImport() {
-		super(ADVANCED_MODE);
-	}
-
-	@Override
-	protected Set<ReversibleProject> getReversibleList() {
-		return ADL4EclipseUtils.getWorkspaceFeatures();
-	}
-}
-\ No newline at end of file
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/SimplePluginImport.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/SimplePluginImport.java
deleted file mode 100644
index 1a64354a659..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/SimplePluginImport.java
+++ /dev/null
@@ -1,36 +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:
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.adl4eclipsetool.assistant;
-
-import java.util.Set;
-
-import org.eclipse.papyrus.adltool.ADL4EclipseUtils;
-import org.eclipse.papyrus.adltool.reversible.project.ReversibleProject;
-
-/**
- * This class is used to do the reverse engineering from workspace plug-in. It adds only in the platform dependencies.
- */
-public class SimplePluginImport extends AbstractImportWizard {
-
-	private static final boolean ADVANCED_MODE = false;
-
-	public SimplePluginImport() {
-		super(ADVANCED_MODE);
-	}
-
-	@Override
-	protected Set<ReversibleProject> getReversibleList() {
-		return ADL4EclipseUtils.getWorkspacePlugins();
-	}
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/handlers/ArchitectureModelPropertyTester.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/handlers/ArchitectureModelPropertyTester.java
deleted file mode 100644
index e8671449c49..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/handlers/ArchitectureModelPropertyTester.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2016 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
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.adl4eclipsetool.assistant.handlers;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.adl4eclipse.org.ADL4Eclipse_Stereotypes;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * {@link PropertyTester} for Architecture Models
- */
-public class ArchitectureModelPropertyTester extends PropertyTester {
-
-	/** Tester ID for UML Profile nature */
-	public final static String IS_ARCHITECTURE_MODEL = "isArchitectureModel";
-
-	/** Default constructor */
-	public ArchitectureModelPropertyTester() {
-	}
-
-	/** Test the receiver against the selected property */
-	@Override
-	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
-		if (IS_ARCHITECTURE_MODEL.equals(property)) {
-			EObject root = getRoot(receiver);
-			return root instanceof Package
-					&& (((Package) root).getAppliedProfile(ADL4Eclipse_Stereotypes.ADL4ECLIPSE) != null);
-		}
-
-		return false;
-	}
-
-	private EObject getRoot(Object receiver) {
-		if (receiver instanceof IStructuredSelection) {
-			IStructuredSelection selection = (IStructuredSelection) receiver;
-			if (!selection.isEmpty()) {
-				return EMFHelper.getEObject(selection.getFirstElement());
-			}
-		}
-		return null;
-	}
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/handlers/ModelRefactoringHandler.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/handlers/ModelRefactoringHandler.java
deleted file mode 100644
index cfe88f65d41..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/handlers/ModelRefactoringHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.eclipse.papyrus.adl4eclipsetool.assistant.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.adl4eclipse.org.ADL4Eclipse_Stereotypes;
-import org.eclipse.papyrus.adltool.Activator;
-import org.eclipse.papyrus.adltool.designer.ArchitectureRefactoring;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * Handler that refactors the ADL4Eclipse model, based on some rules
- */
-public class ModelRefactoringHandler extends AbstractHandler {
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection selection = HandlerUtil.getCurrentSelectionChecked(event);
-		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-			final EObject rootModel = EMFHelper.getEObject(((IStructuredSelection) selection).getFirstElement());
-			if (rootModel instanceof Package
-					&& (((Package) rootModel).getAppliedProfile(ADL4Eclipse_Stereotypes.ADL4ECLIPSE) != null)) {
-				Job refactoringJob = new Job("Refactoring Architecture Model") {
-
-					@Override
-					protected IStatus run(IProgressMonitor monitor) {
-						final Command command = ArchitectureRefactoring.getRefactoringCommand((Package) rootModel,
-								monitor);
-						if (command != null && command.canExecute()) {
-							try {
-								final TransactionalEditingDomain domain = ServiceUtilsForEObject.getInstance()
-										.getTransactionalEditingDomain(rootModel);
-								if (domain != null) {
-									domain.getCommandStack().execute(command);
-								}
-							} catch (ServiceException e) {
-								Activator.log.error(e);
-								return new Status(IStatus.ERROR,
-										org.eclipse.papyrus.adltool.assistant.Activator.PLUGIN_ID,
-										e.getLocalizedMessage(), e);
-							}
-						}
-						return Status.OK_STATUS;
-					}
-				};
-				refactoringJob.schedule();
-			}
-		}
-		return null;
-
-	}
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ADLToolAbstractHandler.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ADLToolAbstractHandler.java
deleted file mode 100644
index dd437b69b03..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ADLToolAbstractHandler.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:
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.adltool.assistant;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Element;
-
-/**
- * Abstract handler in order to connect to papyrus
- *
- */
-public abstract class ADLToolAbstractHandler extends AbstractHandler {
-
-	protected TransactionalEditingDomain transactionalEditingDomain = null;
-	protected PapyrusMultiDiagramEditor papyrusEditor;
-
-	/**
-	 * getSelected element in the diagram or in hte model explorer
-	 *
-	 * @return Element or null
-	 */
-	protected Element getSelection() {
-		org.eclipse.uml2.uml.Element selectedElement = null;
-		ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
-		ISelection selection = selectionService.getSelection();
-		// look for papyrus
-		int i = 0;
-		while (!(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor() instanceof IMultiDiagramEditor) && i < 100000) {
-			i++;
-		}
-		if ((PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor() instanceof IMultiDiagramEditor)) {
-			IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-			papyrusEditor = ((PapyrusMultiDiagramEditor) editorPart);
-
-			if (selection instanceof IStructuredSelection) {
-				Object selectedobject = ((IStructuredSelection) selection).getFirstElement();
-				if (selectedobject instanceof GraphicalEditPart) {
-					Object graphicalElement = ((GraphicalEditPart) selectedobject).getModel();
-					if ((graphicalElement instanceof View) && ((View) graphicalElement).getElement() instanceof org.eclipse.uml2.uml.Element) {
-						selectedElement = (org.eclipse.uml2.uml.Element) ((View) graphicalElement).getElement();
-					}
-				}
-				else if (selectedobject instanceof IAdaptable) {
-					EObject selectedEObject = (EObject) ((IAdaptable) selectedobject).getAdapter(EObject.class);
-					if (selectedEObject instanceof org.eclipse.uml2.uml.Element) {
-						selectedElement = (Element) selectedEObject;
-					}
-				}
-
-			}
-			return selectedElement;
-		}
-		return null;
-	}
-
-	/**
-	 * getSelected element in the diagram or in hte model explorer
-	 *
-	 * @return Element or null
-	 */
-	protected ArrayList<Element> getSelectionSet() {
-		ArrayList<Element> selectedSet = new ArrayList<Element>();
-		ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
-		ISelection selection = selectionService.getSelection();
-
-		// look for papyrus
-		int i = 0;
-		while (!(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor() instanceof IMultiDiagramEditor) && i < 100000) {
-			i++;
-		}
-		if ((PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor() instanceof IMultiDiagramEditor)) {
-			IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-			papyrusEditor = ((PapyrusMultiDiagramEditor) editorPart);
-
-			if (selection instanceof IStructuredSelection) {
-				@SuppressWarnings("rawtypes")
-				Iterator selectedobjectIteractor = ((IStructuredSelection) selection).iterator();
-				while (selectedobjectIteractor.hasNext()) {
-					Object currentSelection = selectedobjectIteractor.next();
-					if (currentSelection instanceof GraphicalEditPart) {
-						Object graphicalElement = ((GraphicalEditPart) currentSelection).getModel();
-						if ((graphicalElement instanceof View) && ((View) graphicalElement).getElement() instanceof org.eclipse.uml2.uml.Element) {
-							selectedSet.add((org.eclipse.uml2.uml.Element) ((View) graphicalElement).getElement());
-						}
-					}
-					else if (currentSelection instanceof IAdaptable) {
-						EObject selectedEObject = (EObject) ((IAdaptable) currentSelection).getAdapter(EObject.class);
-						if (selectedEObject instanceof org.eclipse.uml2.uml.Element) {
-							selectedSet.add((Element) selectedEObject);
-						}
-					}
-				}
-
-
-			}
-			return selectedSet;
-		}
-		return selectedSet;
-	}
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/Activator.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/Activator.java
deleted file mode 100644
index 6663b484f80..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/Activator.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:
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.adltool.assistant;
-
-import org.eclipse.ui.IStartup;
-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 implements IStartup {
-
-	/** The plug-in ID **/
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.adl4eclipsetool.assistant"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	@Override
-	public void earlyStartup() {
-	}
-
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleContentProvider.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleContentProvider.java
deleted file mode 100644
index 84ac3af83dc..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleContentProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 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:
- *  Thomas Daniellou (CEA LIST) - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.adltool.assistant.wizard;
-
-import java.util.ArrayList;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-public class BundleContentProvider implements ITreeContentProvider {
-
-	@Override
-	public void dispose() {
-	}
-
-	@Override
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	}
-
-	@Override
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof ArrayList) {
-			return ((ArrayList<?>) inputElement).toArray();
-		}
-
-		return null;
-	}
-
-	@Override
-	public Object[] getChildren(Object parentElement) {
-		return null;
-	}
-
-	@Override
-	public Object getParent(Object element) {
-		return null;
-	}
-
-	@Override
-	public boolean hasChildren(Object element) {
-		return false;
-	}
-
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleLabelProvider.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleLabelProvider.java
deleted file mode 100644
index 3a4bbf6d062..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleLabelProvider.java
+++ /dev/null
@@ -1,49 +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:
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.adltool.assistant.wizard;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.papyrus.adltool.reversible.project.ReversibleProject;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This class is a label provider that helps displaying a list of bundle in a
- * GUI.
- */
-public class BundleLabelProvider extends LabelProvider {
-
-	/**
-	 * Constructor.
-	 */
-	public BundleLabelProvider() {
-	}
-
-	@Override
-	public Image getImage(Object bundleProject) {
-		if (bundleProject instanceof ReversibleProject) {
-			return ((ReversibleProject) bundleProject).getImage();
-		}
-
-		return super.getImage(bundleProject);
-	}
-
-	@Override
-	public String getText(Object element) {
-		if (element instanceof ReversibleProject) {
-			return ((ReversibleProject) element).getId();
-		}
-
-		return super.getText(element);
-	}
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleSelectionPage.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleSelectionPage.java
deleted file mode 100644
index d9a16e94ceb..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleSelectionPage.java
+++ /dev/null
@@ -1,499 +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:
- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
- *  Thomas Daniellou (CEA LIST) - Refactoring
- *****************************************************************************/
-package org.eclipse.papyrus.adltool.assistant.wizard;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.adltool.ADLConstants;
-import org.eclipse.papyrus.adltool.designer.ReverseSettings;
-import org.eclipse.papyrus.adltool.reversible.Reversible;
-import org.eclipse.papyrus.adltool.reversible.project.ReversibleProject;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.swt.widgets.Spinner;
-
-/**
- * A wizard page that will help selecting a set of bundles from a list
- */
-public class BundleSelectionPage extends WizardPage {
-
-	/**
-	 * The composite that holds the wizard's widget.
-	 */
-	private Composite composite;
-
-	/**
-	 * The list of bundles that can be selected for the reverse.
-	 */
-	private Set<ReversibleProject> bundleList;
-
-	/**
-	 * The list of selected bundles to be reversed.
-	 */
-	private Set<ReversibleProject> selectedBundleList;
-
-	/**
-	 * The tree viewer with check-boxes on each node.
-	 */
-	private CheckboxTreeViewer viewer;
-
-	/**
-	 * The combo viewer of available Papyrus models.
-	 */
-	private ComboViewer comboViewer;
-
-	/**
-	 * The group holding the tree widgets.
-	 */
-	private Group groupTree;
-
-	/**
-	 * The tree that will help the user selecting the project(s) to reverse.
-	 */
-	private BundleSelectionTree elementTree;
-
-	/**
-	 * The text area that will hold the selected project's description.
-	 */
-	private Text descriptionContent;
-
-	/**
-	 * The indicator of the number of selected project to reverse.
-	 */
-	protected Label selectionIndicator;
-
-	/**
-	 * The model to show in the combo viewer. The wizard will not be able to
-	 * finish if this field is null.
-	 */
-	private Package selectedModel;
-
-	/**
-	 * Whether the page is in "Advanced mode" or not.
-	 */
-	private boolean advanced;
-
-	/**
-	 * Depth selector. (Advanced mode)
-	 */
-	private Spinner depthSpinner;
-
-	/**
-	 * Whether the depth is infinite or not.
-	 */
-	private boolean infiniteDepth;
-
-	private ReverseSettings settings;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param bundleList
-	 *            The list of bundles to display in the selection tree
-	 * @param modelList
-	 */
-	public BundleSelectionPage(Set<ReversibleProject> bundleList, boolean advanced) {
-		super("Bundle Selection");
-		setTitle("Bundle Selection");
-		setDescription("Select bundles to create the architecture model.");
-
-		this.bundleList = bundleList;
-		this.advanced = advanced;
-
-		selectedBundleList = new HashSet<>();
-		settings = new ReverseSettings();
-	}
-
-	/**
-	 *
-	 * @return
-	 */
-	public Package getSelectedModel() {
-		return selectedModel;
-	}
-
-	/**
-	 * Sets the model to display in the combo box.
-	 *
-	 * @param selectedModel
-	 */
-	public void setSelectedModel(Package selectedModel) {
-		this.selectedModel = selectedModel;
-	}
-
-	/**
-	 * Returns the elements to import.
-	 *
-	 * @return the list of selected bundle
-	 */
-	public Set<ReversibleProject> getResult() {
-		return selectedBundleList;
-	}
-
-	@Override
-	public void createControl(Composite parent) {
-		// Create the composite to hold the widgets
-		composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout(1, false));
-
-		// Create the widgets
-		createGroupModel();
-		createTree();
-		createDescription();
-		createButtons();
-		createAdvancedProperties();
-
-		selectionIndicator = new Label(groupTree, NONE);
-		updateSelectionIndicator();
-
-		setControl(composite);
-
-		setPageComplete(false);
-	}
-
-	private void createAdvancedProperties() {
-		Group grpSettings = new Group(composite, SWT.NONE);
-		grpSettings.setLayout(new GridLayout(5, false));
-		GridData groupSettingsGridData = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1);
-		groupSettingsGridData.exclude = !advanced;
-		grpSettings.setLayoutData(groupSettingsGridData);
-		grpSettings.setText("Reverse settings");
-
-		final Button btnChildren = new Button(grpSettings, SWT.CHECK);
-		btnChildren.setText("Dependencies");
-		btnChildren.setSelection(settings.reverseDependencies());
-
-		final Button btnCheckExportPackages = new Button(grpSettings, SWT.CHECK);
-		btnCheckExportPackages.setText("Exported packages");
-		btnCheckExportPackages.setSelection(settings.reverseExportPackages());
-
-		final Button btnCheckImportPackages = new Button(grpSettings, SWT.CHECK);
-		btnCheckImportPackages.setText("Imported packages");
-		btnCheckImportPackages.setSelection(settings.reverseImportPackages());
-
-		final Button btnCheckExtensionPoints = new Button(grpSettings, SWT.CHECK);
-		btnCheckExtensionPoints.setText("Extension points");
-		btnCheckExtensionPoints.setSelection(settings.reverseExtensionPoints());
-
-		final Button btnCheckExtensions = new Button(grpSettings, SWT.CHECK);
-		btnCheckExtensions.setText("Extensions");
-		btnCheckExtensions.setSelection(settings.reverseExtensions());
-
-		Group grpAdvanced = new Group(composite, SWT.NONE);
-		grpAdvanced.setLayout(new GridLayout(3, false));
-		GridData groupAdvancedGridData = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1);
-		groupAdvancedGridData.exclude = !advanced;
-		grpAdvanced.setLayoutData(groupAdvancedGridData);
-		grpAdvanced.setText("Advanced settings");
-
-		Label depthLabel = new Label(grpAdvanced, SWT.NONE);
-		depthLabel.setText("Reverse depth:");
-
-		depthSpinner = new Spinner(grpAdvanced, SWT.BORDER);
-		depthSpinner.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1));
-		depthSpinner.setPageIncrement(1);
-		depthSpinner.setMinimum(1);
-		depthSpinner.setSelection(1);
-
-		final Button btnInfinite = new Button(grpAdvanced, SWT.CHECK);
-		btnInfinite.setText("Infinite");
-
-		btnChildren.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent event) {
-				boolean reverseChildren = ((Button) event.getSource()).getSelection();
-
-				settings.setReverseChildren(reverseChildren);
-			}
-
-		});
-
-		btnCheckExportPackages.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent event) {
-				boolean reverseExportPackages = ((Button) event.getSource()).getSelection();
-
-				settings.setReverseExportPackages(reverseExportPackages);
-			}
-
-		});
-
-		btnCheckImportPackages.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent event) {
-				boolean reverseImportPackages = ((Button) event.getSource()).getSelection();
-
-				settings.setReverseImportPackages(reverseImportPackages);
-			}
-
-		});
-
-		btnCheckExtensionPoints.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent event) {
-				boolean reverseExtensionPoints = ((Button) event.getSource()).getSelection();
-
-				settings.setReverseExtensionPoints(reverseExtensionPoints);
-				settings.setReverseExtensions(reverseExtensionPoints);
-
-				btnCheckExtensions.setSelection(reverseExtensionPoints);
-				btnCheckExtensions.setEnabled(reverseExtensionPoints);
-			}
-
-		});
-
-		btnCheckExtensions.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent event) {
-				boolean reverseExtensions = ((Button) event.getSource()).getSelection();
-
-				settings.setReverseExtensions(reverseExtensions);
-			}
-
-		});
-
-		btnInfinite.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent event) {
-				infiniteDepth = ((Button) event.getSource()).getSelection();
-				depthSpinner.setEnabled(!infiniteDepth);
-			}
-
-		});
-	}
-
-	private void createGroupModel() {
-		Composite groupModel = new Composite(composite, NONE);
-		groupModel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
-		groupModel.setLayout(new GridLayout(2, false));
-
-		Label labelModel = new Label(groupModel, SWT.NONE);
-		labelModel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, true, 1, 1));
-		labelModel.setText("Model:");
-
-		comboViewer = new ComboViewer(groupModel, SWT.READ_ONLY);
-		Combo combo = comboViewer.getCombo();
-		combo.setEnabled(false);
-		combo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-
-		comboViewer.setContentProvider(ArrayContentProvider.getInstance());
-		comboViewer.setLabelProvider(new LabelProvider() {
-			@Override
-			public String getText(Object element) {
-				if (element instanceof Package) {
-					return ((Package) element).getLabel();
-				}
-				return super.getText(element);
-			}
-		});
-
-		if (selectedModel != null) {
-			// Add the selected model in the combo box and preselect it
-			Package[] input = new Package[] { selectedModel };
-
-			comboViewer.setInput(input);
-			comboViewer.setSelection(new StructuredSelection(comboViewer.getElementAt(0)), true);
-		}
-	}
-
-	private void createTree() {
-		groupTree = new Group(composite, NONE);
-		groupTree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
-		groupTree.setText("Available projects");
-		groupTree.setLayout(new GridLayout(1, false));
-
-		elementTree = new BundleSelectionTree(groupTree);
-
-		GridData gridElementTree = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
-		gridElementTree.heightHint = 150;
-
-		elementTree.setLayoutData(gridElementTree);
-
-		viewer = elementTree.getViewer();
-		viewer.setContentProvider(new BundleContentProvider());
-		viewer.setLabelProvider(new BundleLabelProvider());
-		viewer.setInput(getTreeItems());
-
-		viewer.addCheckStateListener(new ICheckStateListener() {
-
-			@Override
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				if (event.getElement() instanceof ReversibleProject) {
-					if (event.getChecked()) {
-						selectedBundleList.add((ReversibleProject) event.getElement());
-					} else {
-						selectedBundleList.remove(event.getElement());
-					}
-
-					if (selectedBundleList.size() > 0) {
-						setPageComplete(true);
-					} else {
-						setPageComplete(false);
-					}
-
-					updateSelectionIndicator();
-				}
-			}
-		});
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (event.getSelection() instanceof IStructuredSelection) {
-					IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-					Iterator<?> iterator = selection.iterator();
-
-					while (iterator.hasNext()) {
-						Object domain = iterator.next();
-						if (domain instanceof Reversible) {
-							String text = ((ReversibleProject) domain).getDescription();
-							descriptionContent.setText(( text !=null ) ? text : "");
-						}
-					}
-				}
-			}
-		});
-	}
-
-	private void createDescription() {
-		Composite descriptionContainer = new Composite(groupTree, SWT.NULL);
-		descriptionContainer.setLayout(new GridLayout(1, false));
-
-		GridData gridDescriptionContainer = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1);
-		gridDescriptionContainer.heightHint = 120;
-
-		descriptionContainer.setLayoutData(gridDescriptionContainer);
-
-		Label descriptionLabel = new Label(descriptionContainer, SWT.NONE);
-		descriptionLabel.setText("Description:");
-
-		descriptionContent = new Text(descriptionContainer, SWT.BORDER | SWT.READ_ONLY | SWT.WRAP | SWT.V_SCROLL | SWT.MULTI);
-		descriptionContent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
-	}
-
-	private void createButtons() {
-		Composite buttonsContainer = new Composite(groupTree, SWT.NULL);
-		buttonsContainer.setLayout(new RowLayout());
-
-		Button selectAll = new Button(buttonsContainer, SWT.PUSH);
-		selectAll.setText("Select All");
-		selectAll.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				// Select all items in the filtered tree
-				TreeItem[] treeItems = viewer.getTree().getItems();
-
-				for (TreeItem treeItem : treeItems) {
-					ReversibleProject bundle = (ReversibleProject) treeItem.getData();
-					viewer.setChecked(bundle, true);
-					selectedBundleList.add(bundle);
-				}
-
-				setPageComplete(true);
-				updateSelectionIndicator();
-			}
-		});
-
-		Button deselectAll = new Button(buttonsContainer, SWT.PUSH);
-		deselectAll.setText("Deselect All");
-		deselectAll.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				TreeItem[] treeItems = viewer.getTree().getItems();
-
-				for (TreeItem treeItem : treeItems) {
-					viewer.setChecked(treeItem.getData(), false);
-				}
-
-				selectedBundleList.clear();
-
-				setPageComplete(false);
-				updateSelectionIndicator();
-			}
-		});
-	}
-
-	private Object getTreeItems() {
-		List<ReversibleProject> treeItems = new ArrayList<>();
-
-		for (ReversibleProject bundle : bundleList) {
-			treeItems.add(bundle);
-		}
-
-		// Sort the tree items by Id
-		Collections.sort(treeItems, new Comparator<ReversibleProject>() {
-			@Override
-			public int compare(ReversibleProject reversible1, ReversibleProject reversible2) {
-				return reversible1.getId().compareTo(reversible2.getId());
-			}
-		});
-
-		return treeItems;
-	}
-
-	private void updateSelectionIndicator() {
-		selectionIndicator.setText(selectedBundleList.size() + " of " + bundleList.size() + " projects selected");
-	}
-
-	public ReverseSettings getReverseSettings() {
-		int reverseDepth = infiniteDepth ? ADLConstants.INFINITE_DEPTH_OPTION : depthSpinner.getSelection();
-
-		settings.setReverseDepth(reverseDepth);
-
-		return settings;
-	}
-
-	@Override
-	public boolean isPageComplete() {
-		return super.isPageComplete() && getSelectedModel() != null;
-	}
-}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleSelectionTree.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleSelectionTree.java
deleted file mode 100644
index 95bc41037cf..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/wizard/BundleSelectionTree.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 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:
- *  Thomas Daniellou (CEA LIST) - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.adltool.assistant.wizard;
-
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.FilteredTree;
-import org.eclipse.ui.dialogs.PatternFilter;
-
-public class BundleSelectionTree extends FilteredTree {
-
-	public BundleSelectionTree(Composite parent) {
-		super(parent, SWT.CHECK | SWT.MULTI | SWT.V_SCROLL, new PatternFilter(), true);
-
-		getPatternFilter().setIncludeLeadingWildcard(true);
-	}
-
-	@Override
-	protected TreeViewer doCreateTreeViewer(Composite parent, int style) {
-		return new CheckboxTreeViewer(parent, style);
-	}
-
-	@Override
-	public CheckboxTreeViewer getViewer() {
-		return (CheckboxTreeViewer) treeViewer;
-	}
-}