[Designer] [Releng] Move java extra plugins to Designer extra repo

Change-Id: I09bfde40950b9219e7bacf5c80cfc2d15e5fdffc
Signed-off-by: Shuai Li <shuai.li@cea.fr>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java-updatesite/site.xml b/languages/java/org.eclipse.papyrus.designer.languages.java-updatesite/site.xml
deleted file mode 100644
index c77184a..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java-updatesite/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/org.eclipse.papyrus.java.generator.feature_0.10.0.201305271555.jar" id="org.eclipse.papyrus.java.generator.feature" version="0.10.0.201305271555">
-      <category name="org.eclipse.papyrus.java.generator"/>
-      <category name="org.eclipse.papyrus.java"/>
-   </feature>
-   <feature url="features/org.eclipse.papyrus.java.reverse.feature_0.10.0.201305271555.jar" id="org.eclipse.papyrus.java.reverse.feature" version="0.10.0.201305271555">
-      <category name="org.eclipse.papyrus.java"/>
-   </feature>
-   <feature url="features/org.eclipse.papyrus.java.profile.feature_0.10.0.201305271555.jar" id="org.eclipse.papyrus.java.profile.feature" version="0.10.0.201305271555">
-      <category name="org.eclipse.papyrus.java.profile"/>
-      <category name="org.eclipse.papyrus.java"/>
-   </feature>
-   <category-def name="org.eclipse.papyrus.java.generator" label="Java Generator">
-      <description>
-         Java Classes generator. This feature allows to generate Java classes from Papyrus classes and packages. It also allows to generate projects.
-      </description>
-   </category-def>
-   <category-def name="org.eclipse.papyrus.java.profile" label="Java Profile for classes and project generation">
-      <description>
-         This profile is used by the Java generator and the Java reverse to add additional properties to the UML model. These properties allows to change the names, specify  project target, source targets, ...
-      </description>
-   </category-def>
-   <category-def name="org.eclipse.papyrus.java" label="Java Tools For Papyrus">
-      <description>
-         Tools related to the Java language. This set of plugins allows to reverse java code to a Papyrus model, and to generate  Java code from a Papyrus model.
-      </description>
-   </category-def>
-</site>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.classpath b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.classpath
deleted file mode 100644
index c72d35a..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.project b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.project
deleted file mode 100644
index ca12abf..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.settings/org.eclipse.core.resources.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.core.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94d61f0..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.ui.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281d..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.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/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.settings/org.eclipse.m2e.core.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF
deleted file mode 100644
index 3eea941..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.uml2.uml,
- org.eclipse.m2m.qvt.oml,
- org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt;bundle-version="0.7.0",
- org.eclipse.core.runtime,
- org.eclipse.papyrus.designer.languages.java.generator.transfo.umltojdt;bundle-version="0.7.0",
- org.eclipse.jdt.core,
- org.eclipse.jface.text,
- org.eclipse.jdt.launching,
- org.eclipse.core.resources
-Export-Package: org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.2
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/about.html b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/about.html
deleted file mode 100644
index d35d5ae..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/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/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/build.properties b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/build.properties
deleted file mode 100644
index c2d342d..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               icons/,\
-               about.html,\
-               plugin.properties
-src.includes = about.html
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/icons/generate.psd b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/icons/generate.psd
deleted file mode 100644
index 9a555a9..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/icons/generate.psd
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/icons/generation.png b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/icons/generation.png
deleted file mode 100644
index 6a55c43..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/icons/generation.png
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/icons/sample.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/icons/sample.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/plugin.properties b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/plugin.properties
deleted file mode 100644
index 4180c17..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-#################################################################################
-# Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
-# 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
-# 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception 
-#
-#################################################################################
-
-
-pluginName = Jdt Synchronizer (Incubation)
-providerName = Eclipse Modeling Project
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/pom.xml b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/pom.xml
deleted file mode 100644
index ba508ca..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus.designer</groupId>
-		<artifactId>org.eclipse.papyrus.designer.languages.java</artifactId>
-		<version>1.0.2</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<description>This module contains the synchronization of code modified within JDT with the model</description>
-</project>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/GeneratorPreference.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/GeneratorPreference.java
deleted file mode 100644
index 75955f5..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/GeneratorPreference.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer;
-
-public interface GeneratorPreference {
-
-	/**
-	 * indicate if methods of inherits interfaces must be implement in a class
-	 *
-	 * @return
-	 */
-	public boolean implementMethodsOfIntefaces();
-
-	/**
-	 * indicate if methods of inherit abstract class must be implement in a class
-	 *
-	 * @return
-	 */
-	public boolean implementMethodsOfAbstractClass();
-
-	/**
-	 * indicate if getters must be create
-	 *
-	 * @return
-	 */
-	public boolean generateGetters();
-
-	/**
-	 * indicate if setters must be create
-	 *
-	 * @return
-	 */
-	public boolean generateSetters();
-
-	/**
-	 * indicate if a package must be generate
-	 *
-	 * @param packageQualifiedName
-	 *            package to generate
-	 * @return
-	 */
-	public boolean isPackageToGenerate(String packageQualifiedName);
-
-	/**
-	 *
-	 * @return generic class to use for the association * (multi-value)
-	 */
-	public String genericClassForMultiValue();
-
-	/**
-	 * Return true if we want to stop on first error, false if we want to continue anyway.
-	 *
-	 * @return
-	 */
-	public boolean stopOnFirstError();
-
-	/**
-	 *
-	 * @return the default source folder name where the generator have to generate Java files and packages.
-	 */
-	public String defaultSourceFolderName();
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/RunGenerator.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/RunGenerator.java
deleted file mode 100644
index c0a1cd8..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/RunGenerator.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.m2m.qvt.oml.BasicModelExtent;
-import org.eclipse.m2m.qvt.oml.ExecutionContextImpl;
-import org.eclipse.m2m.qvt.oml.ExecutionDiagnostic;
-import org.eclipse.m2m.qvt.oml.ModelExtent;
-import org.eclipse.m2m.qvt.oml.TransformationExecutor;
-import org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl.SynchJDTJavaModel;
-import org.eclipse.papyrus.designer.languages.java.generator.transfo.umltojdt.UmltojdtActivator;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.GeneratoroptionsmmFactory;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.Options;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaModel;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitor;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitorException;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.resource.UMLResource;
-
-/**
- * Class to Run the QVT Transformation, and then the Java generation
- */
-public class RunGenerator {
-
-	/**
-	 * This is the metamodele
-	 */
-	private EList<EObject> inObjects;
-
-	/**
-	 * Constructor of RunGenerator using .uml file
-	 *
-	 * @param UMLFileUrl
-	 *            the '.uml' file's url
-	 * @throws FileNotFoundException
-	 */
-	public RunGenerator(String umlFileUrl) throws FileNotFoundException {
-
-		// charge the model of the '.uml' file
-		inObjects = loadUmlModel(umlFileUrl);
-	}
-
-	/**
-	 * Constructor of RunGenerator using EList<EObject> metamodel
-	 *
-	 * @param UMLFileUrl
-	 *            the '.uml' file's url
-	 */
-	public RunGenerator(EList<EObject> inObjects) {
-		this.inObjects = inObjects;
-	}
-
-	/**
-	 * run code generation using QVTo transformation
-	 *
-	 * @throws JDTVisitorException
-	 */
-	public void runGeneration(GeneratorPreference preference) throws JDTVisitorException {
-		// Create an options model using the Eclipse Preferences
-		EList<EObject> inOptions = createOptionModelFromEclipsePreferences(preference);
-
-		// Refer to an existing transformation via URI
-		final URI scriptUri =
-				URI.createURI("platform:/plugin/" + UmltojdtActivator.PLUGIN_ID + UmltojdtActivator.PATH_QVT_FILE);
-
-		List<EObject> outObjects = runTransformation(scriptUri, inObjects, inOptions);
-
-		if (outObjects.size() == 0) {
-			throw new JDTVisitorException("No classes or packages produced from the transformation. Nothing is generated.");
-		}
-
-		if (outObjects.size() > 1) {
-			System.err.println("Warning, JDT modele has more than one root. Found root:");
-			for (EObject el : outObjects) {
-				System.err.println(((JDTJavaElement) el).getElementName());
-			}
-			System.err.println("-------");
-		}
-
-		// finally, we synchronize the JDT model with org.eclipse.jdt.core
-		if (outObjects.size() > 0) {
-			/*
-			 * TODO : if metamodel have some root node, we make a loop
-			 * JDTJavaElement proj = (JDTJavaElement) outObjects.get(0);
-			 *
-			 * JDTVisitor visitor = new SynchJDTJavaModel();
-			 * proj.accept(visitor);
-			 */
-			for (Object o : outObjects) {
-				if (o instanceof JDTJavaModel) {
-					JDTJavaElement proj = (JDTJavaElement) o;
-					JDTVisitor visitor = new SynchJDTJavaModel(preference);
-					proj.accept(visitor);
-				}
-
-			}
-		}
-	}
-
-	/**
-	 * Create a new GeneratorOptions model and inject eclipse preferences on it.
-	 *
-	 * @param preference
-	 *            eclipse preferences
-	 * @return a new instance of Options, where options.defaultSourceFolder have been initialized.
-	 */
-	private EList<EObject> createOptionModelFromEclipsePreferences(GeneratorPreference preference) {
-		GeneratoroptionsmmFactory optionsFactory = GeneratoroptionsmmFactory.eINSTANCE;
-
-		// Create a new Options object and inject the default source folder name from Eclipse preferences
-		Options options = optionsFactory.createOptions();
-		options.setDefaultSourceFolder(preference.defaultSourceFolderName());
-
-		// Add options to the model
-		EList<EObject> optionsContents = new BasicEList<EObject>(1);
-		optionsContents.add(options);
-
-		return optionsContents;
-	}
-
-	/**
-	 * Run QVTo transformation using the scriptUri and the inObjects model
-	 *
-	 * @param scriptUri
-	 *            The script QVTo
-	 * @param inObjects
-	 *            The entry model
-	 * @param inOptions2
-	 * @return The output model
-	 */
-	private List<EObject> runTransformation(URI scriptUri, EList<EObject> inObjects, EList<EObject> inOptions) {
-		// initialize the transformation
-		// First, you need to instantiate a Registry:
-		EPackage.Registry registry = new EPackageRegistryImpl(EPackage.Registry.INSTANCE);
-
-		// which is used to register the meta-models in E:\workspace\modelesUML\org.eclipse.papyrus.designer.languages.java.javagen.mmJDT\metaModel
-
-		JdtmmPackage mm1 = JdtmmPackage.eINSTANCE;
-		registry.put(mm1.getNsURI(), mm1);
-
-		// class which allow to execute the transformation
-		TransformationExecutor t = new TransformationExecutor(scriptUri, registry);
-		ExecutionContextImpl executionContext = new ExecutionContextImpl();
-
-		// allow to contains the model uml
-		ModelExtent input = new BasicModelExtent(inObjects);
-		ModelExtent inputOptions = new BasicModelExtent(inOptions);
-		ModelExtent output = new BasicModelExtent();
-		// make the transformation
-		ExecutionDiagnostic executionDiagnostic = t.execute(executionContext, input, inputOptions, output);
-
-		// the errors
-		System.out.println(executionDiagnostic.getMessage());
-		for (Diagnostic d : executionDiagnostic.getChildren()) {
-			System.out.println(d.getMessage());
-		}
-
-
-		// we take the out JDT model in a list
-		return output.getContents();
-	}
-
-
-	/**
-	 * Allow to charge the uml model in a list
-	 *
-	 * @param url
-	 *            the '.uml' file's url
-	 * @return the charge model
-	 * @throws FileNotFoundException
-	 */
-	private EList<EObject> loadUmlModel(String url) throws FileNotFoundException {
-
-		ResourceSet resourceSet = new ResourceSetImpl();
-
-		// charge the metamodel util for read the model
-		resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
-		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
-		// Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap( ).put( "uml", new UMLResourceFactoryImpl());
-
-		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());
-		URIConverter.URI_MAP.put(URI.createURI("pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml"), URI.createFileURI(System.getProperty("user.dir") + "/Model_Libs/UMLPrimitiveTypes.library.uml"));
-
-		// the '.uml' file's url
-		File file = new File(url);
-		if (!file.exists()) {
-			throw new FileNotFoundException("File " + new File(url).getAbsolutePath() + " not found");
-		}
-		URI fileURI = URI.createFileURI(new File(url).getAbsolutePath());
-
-		// demand load the resource for this file.
-		Resource resource = resourceSet.getResource(fileURI, true);
-
-		return resource.getContents();
-	}
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTCommentable.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTCommentable.java
deleted file mode 100644
index 219fbbf..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTCommentable.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Javadoc;
-import org.eclipse.jdt.core.dom.TagElement;
-import org.eclipse.jdt.core.dom.TextElement;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitor;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-/**
- * Useful for class who have to generate Javadoc comment.
- *
- * @author Deblock Nicolas & Manuel Giles
- *
- */
-public abstract class SynchJDTCommentable implements JDTVisitor {
-
-
-	/**
-	 * search the element to insert the Javadoc in compilation unit
-	 *
-	 * @param cu
-	 * @param typeName
-	 * @return
-	 */
-	protected abstract BodyDeclaration searchElementToInsert(CompilationUnit cu, IJavaElement elementName);
-
-	/**
-	 * return javaDoc tag to add. Call in function createJavaDocFor()
-	 *
-	 * @return javaDoc tag to add in a List<String> with String = "@tag comment"
-	 */
-	protected abstract List<String> getJavadocTags();
-
-	/**
-	 * Reads a ICompilationUnit and creates the AST DOM for manipulating the
-	 * Java source file
-	 *
-	 * @param unit
-	 * @return
-	 */
-	private static CompilationUnit parse(ICompilationUnit unit) {
-		ASTParser parser = ASTParser.newParser(AST.JLS3);
-		parser.setKind(ASTParser.K_COMPILATION_UNIT);
-		parser.setSource(unit);
-		parser.setResolveBindings(true);
-		return (CompilationUnit) parser.createAST(null); // parse
-	}
-
-
-	/**
-	 * Create a JavaDoc for a a objet who extends IJavaElement and IMethod
-	 * (IType or IMethod by example)
-	 *
-	 * @param ielement
-	 *            the element you want add javadoc
-	 * @param icu
-	 *            the compilation unit of ielement
-	 * @param comment
-	 *            body of the comment
-	 * @param auteur
-	 *            author of the compilation unit
-	 * @throws JavaModelException
-	 * @throws BadLocationException
-	 * @throws MalformedTreeException
-	 */
-	protected <U extends IJavaElement> void createJavaDocFor(U ielement, ICompilationUnit icu, String comment, String author) throws JavaModelException, MalformedTreeException, BadLocationException {
-
-		CompilationUnit cu = parse(icu);
-		// Authorize modification
-		cu.recordModifications();
-		// create document
-		Document document = new Document(icu.getBuffer().getContents());
-
-		// Creating the new JavaDoc node
-		AST ast = cu.getAST();
-		Javadoc jc = ast.newJavadoc();
-
-		TagElement tag = ast.newTagElement();
-		if (comment != null) {
-			TextElement te = ast.newTextElement();
-			tag.fragments().add(te);
-			te.setText(comment);
-		}
-		jc.tags().add(tag);
-
-		List<String> javadocTags = getJavadocTags();
-		if (javadocTags != null) {
-			for (String s : javadocTags) {
-				tag = ast.newTagElement();
-				tag.setTagName(s);
-				jc.tags().add(tag);
-			}
-		}
-		// add javadoc to type
-		BodyDeclaration classType = searchElementToInsert(cu, ielement);
-		if (classType != null) {
-			classType.setJavadoc(jc);
-		}
-
-		// Applying changes
-		TextEdit text = cu.rewrite(document, icu.getJavaProject().getOptions(true));
-		text.apply(document);
-
-		// set buffer of compilation unit
-		icu.getBuffer().setContents(document.get());
-
-	}
-
-	/**
-	 * search type in type declaration
-	 *
-	 * @param classType
-	 *            type declaration
-	 * @param typeName
-	 *            typeName type name research
-	 * @return
-	 */
-	protected TypeDeclaration searchType(TypeDeclaration classType, String typeName) {
-		if (classType.getName().toString().equals(typeName)) {
-			return classType;
-		}
-
-		for (Object objct : classType.getTypes()) {
-			TypeDeclaration ct = (TypeDeclaration) objct;
-			if (ct.getName().toString().equals(typeName)) {
-				return ct;
-			}
-			searchType(ct, typeName);
-		}
-		return null;
-	}
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTCompilationUnit.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTCompilationUnit.java
deleted file mode 100644
index 47c14be..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTCompilationUnit.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.GeneratorPreference;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTCompilationUnit;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTType;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitor;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitorException;
-
-/**
- * Allow to generate compilation Unit
- *
- * @author Deblock Nicolas & Manuel Giles
- *
- */
-public class SynchJDTCompilationUnit extends EObjectImpl implements JDTVisitor {
-
-	private IPackageFragment ipack;
-
-	private GeneratorPreference preference;
-
-	/**
-	 * Constructor
-	 *
-	 * @param ipack
-	 *            the IPackageFragment parent
-	 */
-	public SynchJDTCompilationUnit(IPackageFragment ipack, GeneratorPreference preference) {
-		super();
-		this.ipack = ipack;
-		this.preference = preference;
-	}
-
-	@Override
-	public void visit(JDTJavaElement element) throws JDTVisitorException {
-		// if element can't be generated, we stop all
-		if (!element.isGenerated()) {
-			return;
-		}
-		if (SynchTools.isPrimiveType(element.getElementName()) && !element.getElementName().equals("String")) {
-			return;
-		}
-
-		JDTCompilationUnit cu = (JDTCompilationUnit) element;
-		try {
-			ICompilationUnit icu = SynchTools.searchIJavaElement(ipack.getCompilationUnits(), cu.getElementName() + ".java");
-
-			if (icu == null) {
-				icu = ipack.createCompilationUnit(cu.getElementName() + ".java", "", true, null);
-				if (!ipack.getElementName().equals(IPackageFragment.DEFAULT_PACKAGE_NAME)) {
-					icu.createPackageDeclaration(ipack.getElementName(), null);
-				}
-			}
-
-			// call the children JDTType
-			JDTVisitor visitor = new SynchJDTType(icu, preference);
-
-			for (JDTType type : cu.getTypes()) {
-				type.accept(visitor);
-			}
-
-			// save the compilation unit
-			icu.save(null, true);
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-			throw new JDTVisitorException(e.getMessage(), e.getCause());
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new JDTVisitorException(e.getMessage(), e.getCause());
-		}
-
-
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTField.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTField.java
deleted file mode 100644
index 9c1560a..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTField.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.GeneratorPreference;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTField;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTType;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitorException;
-
-/**
- * Allow to generate field in a type
- *
- * @author Deblock Nicolas & Manuel Giles
- *
- */
-public class SynchJDTField extends SynchJDTCommentable {
-
-	private IType itype;
-
-	private JDTField field;
-
-	private GeneratorPreference preference;
-
-	/**
-	 * Constructor
-	 *
-	 * @param itype
-	 *            the type parent
-	 */
-	public SynchJDTField(IType itype, GeneratorPreference preference) {
-		super();
-		this.itype = itype;
-		this.preference = preference;
-	}
-
-	@Override
-	public void visit(JDTJavaElement element) throws JDTVisitorException {
-		// if element can't be generated, we stop all
-		if (!element.isGenerated()) {
-			return;
-		}
-
-		field = (JDTField) element;
-
-		StringBuffer buffer = new StringBuffer();
-		try {
-			IField ifield = SynchTools.searchIJavaElement(itype.getFields(), field.getElementName());
-			if (ifield == null && field.getType() != null) {
-				// first : find the import package
-				// create import when it's not a primitive type
-				SynchTools.createImport(itype, field.getOwner(), field.getType());
-
-
-				// visibility
-				buffer.append("\n" + SynchTools.getVisibility(field).toString());
-
-				// // if it's an association *
-				if (field.isMultiValued()) {
-					buffer.append(SynchTools.getMultiValued(itype, field.getType().getElementName(), preference));
-				} else {
-					buffer.append(field.getType().getElementName());
-				}
-
-
-				// create type
-				buffer.append(" " + field.getElementName());
-
-				if (field.getValue() != null) {
-					buffer.append(" = ");
-					if (field.getType().getElementName().equals("char")) {
-						buffer.append("'" + field.getValue().toString() + "'");
-					} else if (field.getType().getElementName().equals("String")) {
-						buffer.append("\"" + field.getValue().toString() + "\"");
-					} else {
-						buffer.append(field.getValue().toString());
-					}
-				}
-
-				buffer.append(";");
-
-				// create type
-				ifield = itype.createField(buffer.toString(), null, true, null);
-
-				// add javadoc to method
-				createJavaDocFor(ifield, ifield.getCompilationUnit(), field.getComment(), "");
-			}
-			else if (field.getType() == null) {
-				System.err.println("No type specified for "
-						+ field.getOwner().getQualifiedName()
-						+ "." + field.getElementName());
-			}
-
-
-			// Generate explicit imports
-			generateExplicitImports(field, itype);
-
-		} catch (JavaModelException e) {
-			// e.printStackTrace();
-			String msg = "Can't generate field (class='"
-					+ field.getOwner().getQualifiedName()
-					+ "', msg= " + e.getMessage()
-					+ ", buffer=" + buffer.toString()
-					+ ")";
-			// System.err.println(msg);
-			// throw new JDTVisitorException( msg, e.getCause());
-			propagateException(msg, e);
-		} catch (Exception e) {
-			// e.printStackTrace();
-			// throw new JDTVisitorException(e.getMessage(), e.getCause());
-			propagateException(e.getMessage(), e);
-		}
-	}
-
-	/**
-	 * Propagate a {@link JDTVisitorException} if the flag is not set
-	 *
-	 * @param msg
-	 * @param e
-	 * @throws JDTVisitorException
-	 */
-	private void propagateException(String msg, Throwable e) throws JDTVisitorException {
-
-		if (preference.stopOnFirstError()) {
-			throw new JDTVisitorException(msg, e.getCause());
-		}
-		else {
-			// Show error
-			System.err.println(msg);
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	protected BodyDeclaration searchElementToInsert(CompilationUnit cu,
-			IJavaElement field) {
-
-		// search Itype parent
-		if (field.getParent() instanceof IType) {
-			IType itype = (IType) field.getParent();
-			// find the good type
-			TypeDeclaration type = searchType((TypeDeclaration) cu.types().get(0), itype.getElementName());
-
-			// search the method. Fortunately, there are no method getSignature() for the type FieldDeclaration.
-			// So, we search manually
-			for (FieldDeclaration fs : type.getFields()) {
-				if (fs.toString().contains((field.getElementName()))) {
-					return fs;
-				}
-			}
-		}
-		return null;
-	}
-
-	@Override
-	protected List<String> getJavadocTags() {
-		// any javadoc tag
-		return null;
-	}
-
-	/**
-	 * Generate imports that are explicitly declared in the type
-	 *
-	 * @param field2
-	 *            The src type to be transformed
-	 * @param destType
-	 *            The jdt dest type to be generated
-	 * @throws JavaModelException
-	 * @throws JDTVisitorException
-	 */
-	private void generateExplicitImports(JDTField field2, IType destType) throws JDTVisitorException {
-
-
-		// Add explicit type
-		for (JDTType anImport : field2.getExplicitRequiredImports()) {
-			try {
-				destType.getCompilationUnit().createImport(anImport.getQualifiedName(), null, null);
-			} catch (Exception e) {
-				propagateException(destType.getFullyQualifiedName() + "Can't add explicit import " + anImport.getQualifiedName(), e);
-			}
-		}
-
-		// Add explicit plain text types
-		for (String anImport : field2.getExplicitPlainTextRequiredImports()) {
-			try {
-				destType.getCompilationUnit().createImport(anImport, null, null);
-			} catch (JavaModelException e) {
-				propagateException(destType.getFullyQualifiedName() + "Can't add explicit plain text import " + anImport, e);
-			}
-		}
-
-	}
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTGetterSetter.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTGetterSetter.java
deleted file mode 100644
index a64e06a..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTGetterSetter.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.GeneratorPreference;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTField;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.TrueFalseDefault;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitorException;
-
-public class SynchJDTGetterSetter extends SynchJDTMethod {
-
-	private JDTField field;
-
-	private GeneratorPreference preference;
-
-	public SynchJDTGetterSetter(IType it, GeneratorPreference preference) {
-		super(it, preference);
-		this.preference = preference;
-	}
-
-
-	@Override
-	public void visit(JDTJavaElement element) throws JDTVisitorException {
-		this.field = (JDTField) element;
-		// error if field.getType() == null. indicate in console only
-		if (field.getType() == null) {
-			System.err.println("l31 SunchJDTGetterSetter : field.getType() est null pour " + field.getElementName() + " dans " + field.getOwner().getElementName());
-			return;
-		}
-
-
-		try {
-			// name of field
-			String fieldNameCap = field.getElementName().replaceFirst(".", (field.getElementName().charAt(0) + "").toUpperCase());
-
-			// generate getter
-			if (field.getGenerateGetter() == TrueFalseDefault.TRUE || // user demand generate getter
-					field.getGenerateGetter() == TrueFalseDefault.DEFAULT && preference.generateGetters()) { // or no demand, look at preferences
-				StringBuffer bufferGet = new StringBuffer();
-
-				bufferGet.append("public ");
-
-				// handle MultiValued
-				if (field.isMultiValued()) {
-					bufferGet.append(SynchTools.getMultiValued(itype, field.getType().getElementName(), preference));
-				} else {
-					bufferGet.append(field.getType().getElementName());
-				}
-
-
-				bufferGet.append(" get" + fieldNameCap + "() {\n "
-						+ "\t return " + field.getElementName() + "; \n} \n");
-
-
-
-
-				IMethod imethod = SynchTools.searchIJavaElement(itype.getMethods(), "get" + fieldNameCap);
-				if (imethod == null) {
-					IMethod methodGet = itype.createMethod(bufferGet.toString(), null, true, null);
-					createJavaDocFor(methodGet, itype.getCompilationUnit(), "Getter of " + field.getElementName(), "");
-				}
-			}
-
-
-			// generate setter
-			if (field.getGenerateSetter() == TrueFalseDefault.TRUE || // user demand generate setter
-					field.getGenerateSetter() == TrueFalseDefault.DEFAULT && preference.generateSetters()) { // or no demand, look at preferences
-				StringBuffer bufferSet = new StringBuffer();
-
-				bufferSet.append("public void set" + fieldNameCap + "(");
-
-				// handle MultiValued
-				if (field.isMultiValued()) {
-					bufferSet.append(SynchTools.getMultiValued(itype, field.getType().getElementName(), preference));
-				} else {
-					bufferSet.append(field.getType().getElementName());
-				}
-
-				bufferSet.append(" " + field.getElementName() + ") { \n"
-						+ "\t this." + field.getElementName() + " = " + field.getElementName() + "; \n} \n ");
-
-
-
-
-				IMethod imethod = SynchTools.searchIJavaElement(itype.getMethods(), "set" + fieldNameCap);
-				if (imethod == null) {
-					IMethod methodSet = itype.createMethod(bufferSet.toString(), null, true, null);
-					createJavaDocFor(methodSet, itype.getCompilationUnit(), "Setter of " + field.getElementName(), "");
-				}
-			}
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-			throw new JDTVisitorException(e.getMessage(), e.getCause());
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new JDTVisitorException(e.getMessage(), e.getCause());
-		}
-	}
-
-
-	@Override
-	// search the method to insert Javadoc
-	protected BodyDeclaration searchElementToInsert(CompilationUnit cu,
-			IJavaElement method) {
-
-		// search Itype parent
-		if (method.getParent() instanceof IType) {
-			IType itype = (IType) method.getParent();
-			// find the good type
-			TypeDeclaration type = searchType((TypeDeclaration) cu.types().get(0), itype.getElementName());
-
-			// search the method. Fortunately, there are no method getSignature() for the type MethodDeclaration.
-			// So, we search manually
-			for (MethodDeclaration m : type.getMethods()) {
-				if (m.getName().toString().equals(method.getElementName())) {
-					// verify the signature
-					return m;
-					/*
-					 * TODO
-					 * if(m.parameters() !=null && m.parameters().size() == 0 && this.method.getParameters().size() == 0)
-					 * return m;
-					 * if(m.parameters().size() == this.method.getParameters().size()) {
-					 * int numParam = 0;
-					 * boolean goodSignature = true;
-					 * for(Object paramObj : m.parameters()) {
-					 * if(paramObj instanceof SingleVariableDeclaration) {
-					 * SingleVariableDeclaration param = (SingleVariableDeclaration) paramObj;
-					 * if(!param.getType().toString().equals(this.method.getParameters().get(numParam).getType().getElementName()))
-					 * goodSignature = false;
-					 *
-					 * numParam++;
-					 * }
-					 * }
-					 * if(goodSignature)
-					 * return m;
-					 * }
-					 */
-				}
-			}
-		}
-
-		return null;
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTJavaModel.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTJavaModel.java
deleted file mode 100644
index 1f02119..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTJavaModel.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl;
-
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.GeneratorPreference;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaModel;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaProject;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitor;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitorException;
-
-/**
- * Allow to generate Code thanks to a JDT model
- *
- * @author Deblock Nicolas & Manuel Giles
- *
- */
-public class SynchJDTJavaModel implements JDTVisitor {
-
-	private GeneratorPreference preference;
-
-	/**
-	 * Constructor
-	 *
-	 * @param modelJDT
-	 *            the model JDT to generate
-	 */
-	public SynchJDTJavaModel(GeneratorPreference preference) {
-		this.preference = preference;
-	}
-
-	@Override
-	public void visit(JDTJavaElement element) throws JDTVisitorException {
-		// if element can't be generated, we stop all
-		// if(!element.isGenerated()) return ;
-
-		if (!(element instanceof JDTJavaModel)) {
-			return;
-		}
-		// cast element to JDTJavaModel
-		JDTJavaModel model = (JDTJavaModel) element;
-
-		// research the IJavaModel
-		IWorkspaceRoot iroot = ResourcesPlugin.getWorkspace().getRoot();
-		IJavaModel ijm = JavaCore.create(iroot);
-
-
-		// browse all JDTJavaProject and call the visit
-		JDTVisitor visitor = new SynchJDTJavaProject(ijm, iroot, preference);
-		for (JDTJavaProject root : model.getJavaProject()) {
-			root.accept(visitor);
-		}
-	}
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTJavaProject.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTJavaProject.java
deleted file mode 100644
index 9cd9a66..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTJavaProject.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.GeneratorPreference;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaProject;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragmentRoot;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.util.JdtmmPreference;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitor;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitorException;
-
-/**
- * Allow to generate Code thanks to a JDT model
- *
- * @author Deblock Nicolas & Manuel Giles
- *
- */
-public class SynchJDTJavaProject implements JDTVisitor {
-
-	private IJavaModel ijm;
-
-	private IWorkspaceRoot iroot;
-
-	private GeneratorPreference preference;
-
-	/**
-	 * Constructor
-	 *
-	 * @param modelJDT
-	 *            the model JDT to generate
-	 */
-	public SynchJDTJavaProject(IJavaModel ijm, IWorkspaceRoot iroot, GeneratorPreference preference) {
-		this.ijm = ijm;
-		this.iroot = iroot;
-		this.preference = preference;
-	}
-
-
-	@Override
-	public void visit(JDTJavaElement element) throws JDTVisitorException {
-		// if element can't be generated, we stop all
-		if (!element.isGenerated()) {
-			return;
-		}
-
-		if (!(element instanceof JDTJavaProject)) {
-			return;
-		}
-		// cast element to JDTJavaProject
-		JDTJavaProject project = (JDTJavaProject) element;
-
-		// set the multi-value for the metamodel
-		JdtmmPreference.setClassMultiValue(preference.genericClassForMultiValue().substring(preference.genericClassForMultiValue().lastIndexOf(".") + 1));
-
-
-		// search IJavaProject
-		// IProject projet = iroot.getProject(project.getElementName());
-		IJavaProject ijavaProjet = ijm.getJavaProject(project.getElementName());
-		IProject proj;
-
-		// if ijavaProjet don't exist, create this!
-		if (!ijavaProjet.exists()) {
-			try {
-				proj = iroot.getProject(project.getElementName());
-				if (!proj.exists()) {
-					proj.create(null);
-					proj.open(null);
-				} else if (!proj.isOpen()) {
-					proj.open(null);
-				}
-
-				// Specifies type of project
-				IProjectDescription description = proj.getDescription();
-				description.setNatureIds(new String[] { JavaCore.NATURE_ID });
-				proj.setDescription(description, null);
-			} catch (CoreException e) {
-				e.printStackTrace();
-				throw new JDTVisitorException(e.getMessage());
-			}
-
-			ijavaProjet = JavaCore.create(proj);
-		}
-
-		// include the default JRE library if don't exist
-		List<IClasspathEntry> entries = new ArrayList<IClasspathEntry>();
-		IVMInstall vmInstall = JavaRuntime.getDefaultVMInstall();
-		boolean creerJRE = true;
-
-
-		try {
-			// take libs to project class path
-			for (IClasspathEntry elem : ijavaProjet.getRawClasspath()) {
-				if (elem.getPath().toString().contains(JavaRuntime.JRE_CONTAINER)) {
-					creerJRE = false;
-				}
-				entries.add(elem);
-			}
-			// if jre don't exist, we add it to classpath
-			if (creerJRE) {
-				entries.add(JavaCore.newContainerEntry(JavaRuntime.newJREContainerPath(vmInstall)));
-				ijavaProjet.setRawClasspath(entries.toArray(new IClasspathEntry[entries.size()]), null);
-			}
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-			throw new JDTVisitorException(e.getMessage(), e.getCause());
-		}
-
-
-
-		// browse all PackageFragmentRoot and call the visit
-		JDTVisitor visitor = new SynchJDTPackageFragmentRoot(ijavaProjet, preference);
-		for (JDTPackageFragmentRoot root : project.getPackageFragmentRoots()) {
-			root.accept(visitor);
-		}
-	}
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTMethod.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTMethod.java
deleted file mode 100644
index 08975c1..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTMethod.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl;
-
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TagElement;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.GeneratorPreference;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTMethod;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTMethodBody;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTParameter;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTType;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitorException;
-
-
-/**
- * Allow to generate Method in a IType
- *
- * @author Deblock Nicolas & Manuel Giles
- *
- */
-public class SynchJDTMethod extends SynchJDTCommentable {
-
-	protected IType itype;
-
-	private JDTMethod method;
-
-	private GeneratorPreference preference;
-
-	/**
-	 * Constructor
-	 *
-	 * @param itype
-	 *            the type parent
-	 */
-	public SynchJDTMethod(IType itype, GeneratorPreference preference) {
-		super();
-		this.itype = itype;
-		this.preference = preference;
-	}
-
-
-
-	@Override
-	public void visit(JDTJavaElement element) throws JDTVisitorException {
-		// if element can't be generated, we stop all
-		if (!element.isGenerated()) {
-			return;
-		}
-
-		method = (JDTMethod) element;
-		// IntroduceParameterObjectDescript
-		IMethod imethod = null;
-
-		try {
-			// See if the method exist
-			boolean createMethod = true;
-
-			for (IMethod m : itype.getMethods()) {
-				// if it's the same name, and the same parameterTypes, the method exist
-				if (m.getElementName().equals(method.getElementName()) && m.getSignature().equals(method.getJDTSignature())) {
-					// stop all
-					createMethod = false;
-					imethod = m;
-					break;
-				}
-			}
-
-			if (createMethod) {
-				StringBuffer methodStr = new StringBuffer("\n");
-
-				// visibility
-				if (itype.isInterface()) {
-					methodStr.append("public ");
-				} else {
-					methodStr.append(SynchTools.getVisibility(method).toString());
-				}
-
-				// if method is a constructor, no return Type, and name is class name
-				if (method.isConstructor()) {
-					methodStr.append(itype.getElementName() + "(");
-				}
-				else {
-					// return type
-					if (method.getReturnType() != null) {
-						// Compute the type, taken into account multivalue
-						String type = getTypeAsString(method.getReturnType());
-						// put the import package
-						SynchTools.createImport(itype, method.getOwner(), method.getReturnType().getType());
-
-						methodStr.append(type + " ");
-					}
-					else {
-						methodStr.append("void ");
-					}
-					// method name
-					methodStr.append(method.getElementName() + "(");
-				}
-				// parameters
-				// System.out.println(method.getParam() + " " + method.getParameterTypes());
-				int nbParam = 0;
-				for (JDTParameter p : method.getParameters()) {
-					String typeName = p.getElementName();
-					String type = "Undefined";
-					if (p.getType() != null) {
-						// Compute the type, taken into account multivalue
-						type = getTypeAsString(p);
-						// put the import package
-						SynchTools.createImport(itype, method.getOwner(), p.getType());
-					}
-
-
-					if (nbParam > 0) {
-						methodStr.append(", ");
-					}
-					methodStr.append(type + " " + typeName);
-					nbParam++;
-				}
-
-				// close
-				methodStr.append(")");
-
-				// throws
-				if (method.getExceptions() != null && method.getExceptions().size() > 0) {
-					methodStr.append(" throws ");
-					int nbExc = 0;
-					for (JDTType exception : method.getExceptions()) {
-						if (nbExc > 0) {
-							methodStr.append(", ");
-						}
-						methodStr.append(exception.getElementName());
-						if (!SynchTools.isPrimiveType(exception.getQualifiedName()) && exception.getQualifiedName().contains(".")) {
-							itype.getCompilationUnit().createImport(exception.getQualifiedName(), null, null);
-						}
-						nbExc++;
-					}
-				}
-
-
-				// Do we need a body ?
-				if (itype.isInterface() || Flags.isAbstract(method.getFlags())) {
-					methodStr.append(";");
-				}
-				else {
-					// Generate Body. Open the body
-					methodStr.append(" {");
-					// If there is a declared body, use it. Otherwise, use the default body.
-					if (method.getBodies().size() > 0) {
-
-						for (JDTMethodBody body : method.getBodies()) {
-							methodStr.append("\n\t");
-							methodStr.append(body.asText());
-						}
-						// methodStr.append("\n");
-					}
-					else {
-						// Default body
-						methodStr.append(" \n\t// TODO Auto-generated method");
-						if (method.getReturnType() != null) {
-							methodStr.append("\n\treturn " + SynchTools.defaultReturn(method.getReturnType().getType().getElementName()) + ";");
-						}
-
-					}
-					// Close the body
-					methodStr.append("\n }");
-				}
-
-				// create the method
-				imethod = itype.createMethod(methodStr.toString(), null, true, null);
-			}
-
-			// add javadoc to method
-			createJavaDocFor(imethod, imethod.getCompilationUnit(), method.getComment(), "");
-			// Add explicit imports
-			generateExplicitImports(method, itype);
-		} catch (JavaModelException e) {
-			// e.printStackTrace();
-			// throw new JDTVisitorException(e.getMessage(), e.getCause());
-			propagateException(e.getMessage(), e);
-		} catch (Exception e) {
-			// e.printStackTrace();
-			// throw new JDTVisitorException(e.getMessage(), e.getCause());
-			propagateException(e.getMessage(), e);
-		}
-
-
-	}
-
-
-	/**
-	 * Get the type of the parameter as a String. Take into account the multivalue setting.
-	 *
-	 * @param p
-	 * @return
-	 * @throws JavaModelException
-	 */
-	private String getTypeAsString(JDTParameter p) throws JavaModelException {
-		String type;
-		if (p.isMultiValued()) {
-			type = SynchTools.getMultiValued(itype, p.getType().getElementName(), preference);
-		} else {
-			type = p.getType().getElementName();
-		}
-		return type;
-	}
-
-
-
-
-
-	/** *************** methods override by SynchJDTCommentable ************** */
-
-
-	@Override
-	/**
-	 * search the method to insert Javadoc
-	 *
-	 * @see org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl.SynchJDTCommentable#searchElementToInsert(org.eclipse.jdt.core.dom.CompilationUnit, org.eclipse.jdt.core.IJavaElement)
-	 *
-	 * @param cu
-	 * @param method
-	 * @return
-	 */
-	protected BodyDeclaration searchElementToInsert(CompilationUnit cu, IJavaElement method) {
-
-		// search Itype parent
-		if (method.getParent() instanceof IType) {
-			IType itype = (IType) method.getParent();
-			// find the good type
-			TypeDeclaration type = searchType((TypeDeclaration) cu.types().get(0), itype.getElementName());
-
-			// search the method. Fortunately, there are no method getSignature() for the type MethodDeclaration.
-			// So, we search manually
-			for (MethodDeclaration m : type.getMethods()) {
-				if (m.getName().toString().equals(method.getElementName())) {
-					// verify the signature
-					if (m.parameters() != null && m.parameters().size() == 0 && this.method.getParameters().size() == 0) {
-						return m;
-					}
-					if (m.parameters().size() == this.method.getParameters().size()) {
-						int numParam = 0;
-						boolean goodSignature = true;
-						for (Object paramObj : m.parameters()) {
-							if (paramObj instanceof SingleVariableDeclaration) {
-								SingleVariableDeclaration param = (SingleVariableDeclaration) paramObj;
-								if (!param.getType().toString().equals(this.method.getParameters().get(numParam).getType().getElementName())) {
-									goodSignature = false;
-								}
-
-								numParam++;
-							}
-						}
-						if (goodSignature) {
-							return m;
-						}
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-
-	@Override
-	protected List<String> getJavadocTags() {
-		List<String> lst = new LinkedList<String>();
-		if (method == null) {
-			return lst;
-		}
-
-		// parameters
-		for (JDTParameter param : method.getParameters()) {
-			String comment = param.getComment();
-			if (comment == null) {
-				comment = "";
-			}
-			lst.add(TagElement.TAG_PARAM + " " + param.getElementName() + " " + comment);
-		}
-
-		// return
-		if (method.getReturnType() != null) {
-			String comment = method.getReturnType().getComment();
-			if (comment == null) {
-				comment = "";
-			}
-			lst.add(TagElement.TAG_RETURN + " " + comment);
-		}
-
-		// exception
-		// TODO prendre en compte notion de commentaire
-		if (method.getExceptions() != null) {
-			for (JDTType exception : method.getExceptions()) {
-				// String comment = exception.getComment();
-				// if(comment == null) comment = "";
-				lst.add(TagElement.TAG_THROWS + " " + exception.getElementName());
-			}
-		}
-
-
-
-		return lst;
-	}
-
-
-
-	/**
-	 * Propagate a {@link JDTVisitorException} if the flag is not set
-	 *
-	 * @param msg
-	 * @param e
-	 * @throws JDTVisitorException
-	 */
-	private void propagateException(String msg, Throwable e) throws JDTVisitorException {
-
-		if (preference.stopOnFirstError()) {
-			throw new JDTVisitorException(msg, e.getCause());
-		}
-		else {
-			// Show error
-			System.err.println(msg);
-			e.printStackTrace();
-		}
-	}
-
-
-
-	/**
-	 * Generate imports that are explicitly declared in the type
-	 *
-	 * @param srcType
-	 *            The src type to be transformed
-	 * @param destType
-	 *            The jdt dest type to be generated
-	 * @throws JavaModelException
-	 * @throws JDTVisitorException
-	 */
-	private void generateExplicitImports(JDTMethod srcType, IType destType) throws JDTVisitorException {
-
-
-		// Add explicit type
-		for (JDTType anImport : srcType.getExplicitRequiredImports()) {
-			try {
-				destType.getCompilationUnit().createImport(anImport.getQualifiedName(), null, null);
-			} catch (Exception e) {
-				propagateException(destType.getFullyQualifiedName() + "Can't add explicit import " + anImport.getQualifiedName(), e);
-			}
-		}
-
-		// Add explicit plain text types
-		for (String anImport : srcType.getExplicitPlainTextRequiredImports()) {
-			try {
-				destType.getCompilationUnit().createImport(anImport, null, null);
-			} catch (JavaModelException e) {
-				propagateException(destType.getFullyQualifiedName() + "Can't add explicit plain text import " + anImport, e);
-			}
-		}
-
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragment.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragment.java
deleted file mode 100644
index d2b9c86..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragment.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.GeneratorPreference;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTCompilationUnit;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragment;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitor;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitorException;
-
-
-/**
- * allow to generate package fragment
- *
- * @author Deblock Nicolas & Manuel Giles
- *
- */
-public class SynchJDTPackageFragment extends EObjectImpl implements JDTVisitor {
-
-	public IPackageFragmentRoot iroot;
-
-	private GeneratorPreference preference;
-
-	/**
-	 * Constructor
-	 *
-	 * @param iroot
-	 *            the IPackageFragmentRoot parent
-	 */
-	public SynchJDTPackageFragment(IPackageFragmentRoot iroot, GeneratorPreference preference) {
-		super();
-		this.iroot = iroot;
-		this.preference = preference;
-	}
-
-
-	@Override
-	public void visit(JDTJavaElement element) throws JDTVisitorException {
-		// if element can't be generated, we stop all
-		if (!element.isGenerated()) {
-			return;
-		}
-		if (!preference.isPackageToGenerate(element.getElementName())) {
-			return;
-		}
-
-		JDTPackageFragment packag = (JDTPackageFragment) element;
-
-		try {
-			// search the package
-			IJavaElement tmp = null;
-			IPackageFragment ipack = null;
-
-
-			if ((tmp = SynchTools.searchIJavaElement(iroot.getChildren(), packag.getElementName())) != null &&
-					tmp instanceof IPackageFragment) {
-				ipack = (IPackageFragment) tmp;
-			}
-
-			// if name=null, it's the default package
-			if (packag.getQualifiedName() == null) {
-				// generate Compilation unit without package
-				IJavaElement defaultPackageElement = SynchTools.searchIJavaElement(iroot.getChildren(), IPackageFragment.DEFAULT_PACKAGE_NAME);
-				if (defaultPackageElement != null) {
-					ipack = (IPackageFragment) defaultPackageElement;
-				}
-			}
-
-			// if the package don't exist, we create it!
-			if (ipack == null) {
-
-				// find the name of the package
-				ipack = iroot.createPackageFragment(packag.getQualifiedName(), true, null);
-
-			}
-
-			// call the children compilationUnit
-			JDTVisitor visitor = new SynchJDTCompilationUnit(ipack, preference);
-			for (JDTCompilationUnit cu : packag.getCompilationUnits()) {
-				cu.accept(visitor);
-			}
-
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-			throw new JDTVisitorException(e.getMessage(), e.getCause());
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new JDTVisitorException(e.getMessage(), e.getCause());
-		}
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragmentRoot.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragmentRoot.java
deleted file mode 100644
index efe44f0..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTPackageFragmentRoot.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.GeneratorPreference;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragment;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragmentRoot;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitor;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitorException;
-
-
-/**
- * allow to generate package fragment root
- *
- * @author Deblock Nicolas & Manuel Giles
- *
- */
-public class SynchJDTPackageFragmentRoot implements JDTVisitor {
-
-	private IJavaProject iprojet;
-
-	private GeneratorPreference preference;
-
-	/**
-	 * Constructor
-	 *
-	 * @param iprojet
-	 *            the project parent
-	 */
-	public SynchJDTPackageFragmentRoot(IJavaProject iprojet, GeneratorPreference preference) {
-		super();
-		this.iprojet = iprojet;
-		this.preference = preference;
-	}
-
-
-
-	@Override
-	public void visit(JDTJavaElement element) throws JDTVisitorException {
-		// if element can't be generated, we stop all
-		if (!element.isGenerated()) {
-			return;
-		}
-
-		JDTPackageFragmentRoot root = (JDTPackageFragmentRoot) element;
-
-		try {
-			// research JDTPackageFragmentRoot
-			IPackageFragmentRoot iroot = SynchTools.searchIJavaElement(iprojet.getAllPackageFragmentRoots(), root.getElementName());
-
-			// if IPackageFragmentRoot don't exist, we create this
-			if (iroot == null) {
-				// create the folder
-				IFolder sourceFolder = iprojet.getProject().getFolder(root.getElementName());
-				try {
-					sourceFolder.create(false, true, null);
-				} catch (CoreException e) {
-					// folder already exist
-				}
-
-				iroot = iprojet.getPackageFragmentRoot(sourceFolder);
-				IClasspathEntry[] oldEntries = iprojet.getRawClasspath();
-				List<IClasspathEntry> newEntries = new ArrayList<IClasspathEntry>();
-
-				// copy the old entries in new entries
-				for (int i = 0; i < oldEntries.length; i++) {
-					// don't take the /projectName, else an exception are throw
-					if (oldEntries[i] != null && !oldEntries[i].getPath().toString().equals("/" + iprojet.getElementName())) {
-						newEntries.add(oldEntries[i]);
-					}
-				}
-
-				// add the new packageFragmentRoot
-				newEntries.add(JavaCore.newSourceEntry(iroot.getPath()));
-
-				IClasspathEntry[] newEntriesArray = new IClasspathEntry[newEntries.size()];
-				newEntries.toArray(newEntriesArray);
-
-				iprojet.setRawClasspath(newEntriesArray, null);
-
-			}
-
-			// call children
-			JDTVisitor visitPackageFragment = new SynchJDTPackageFragment(iroot, preference);
-			for (JDTPackageFragment ipack : root.getPackageFragments()) {
-				ipack.accept(visitPackageFragment);
-			}
-
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-			throw new JDTVisitorException(e.getMessage(), e.getCause());
-		}
-	}
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTType.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTType.java
deleted file mode 100644
index dbcfe2e..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchJDTType.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl;
-
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.TagElement;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.GeneratorPreference;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTField;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTMethod;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTType;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitor;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.visitor.JDTVisitorException;
-
-
-/**
- * Synchronize a JDTType with JDT.
- * Can create a type to a ICompilationUnit or to a IType (useful for intern class).
- *
- * @author Deblock Nicolas & Giles Manuel
- *
- */
-public class SynchJDTType extends SynchJDTCommentable {
-
-	/**
-	 * Useful to create a type in a ICompilationUnit
-	 * If icu is null, itype can't be null
-	 */
-	private ICompilationUnit icu;
-
-	private GeneratorPreference preference;
-
-	/**
-	 * Useful to create a type in a IType
-	 * If itype is null, icu can't be null
-	 */
-	private IType itype;
-
-	/**
-	 * Create a type to a ICompilationUnit
-	 *
-	 * @param icu
-	 */
-	public SynchJDTType(ICompilationUnit icu, GeneratorPreference preference) {
-		super();
-		this.icu = icu;
-		this.preference = preference;
-	}
-
-	/**
-	 * Create a type to a IType (useful for intern class)
-	 *
-	 * @param itype
-	 */
-	public SynchJDTType(IType itype, GeneratorPreference preference) {
-		super();
-		this.itype = itype;
-		this.preference = preference;
-	}
-
-
-
-	@Override
-	public void visit(JDTJavaElement element) throws JDTVisitorException {
-		// if element can't be generated, we stop all
-		if (!element.isGenerated()) {
-			return;
-		}
-		if (SynchTools.isPrimiveType(element.getElementName()) && !element.getElementName().equals("String")) {
-			return;
-		}
-
-		JDTType type = (JDTType) element;
-
-		try {
-			IType it = SynchTools.searchIJavaElement(getTypes(), type.getElementName());
-
-			// generate type
-			if (it == null) {
-				StringBuffer buffer = new StringBuffer();
-
-				buffer.append(SynchTools.getVisibility(type));
-
-				// System.out.println("\n\n \t \t ####### " + type.isEnum());
-
-				if (type.isClass()) {
-					buffer.append("class ");
-				} else if (type.isInterface()) {
-					buffer.append("interface ");
-				} else if (type.isEnum()) {
-
-					// System.out.println( type.getFields());
-
-					// generate the field
-					StringBuffer fieldStr = new StringBuffer();
-					int i = 0;
-					for (JDTField field : type.getFields()) {
-						if (i > 0) {
-							fieldStr.append(",\n");
-						}
-						fieldStr.append("\t" + field.getElementName());
-						i++;
-					}
-					if (!type.getFields().isEmpty()) {
-						fieldStr.append(";\n\n");
-					}
-
-					it = createType("public enum " + type.getElementName() + " { \n" + fieldStr + " \n } ", null, true, null);
-					return;
-					/*
-					 * it = createType("public enum " + type.getElementName() + " { \n" +
-					 * fieldStr +
-					 * "\tprivate final int value;\n\n"+
-					 *
-					 * "\tprivate "+ type.getElementName() +"(int value) {\n"+
-					 * "\t\tthis.value = value;\n"+
-					 * "\t}\n\n"+
-					 *
-					 * "\tpublic int getValue() {\n" +
-					 * "\t\treturn this.value;\n" +
-					 * "\t}\n" +
-					 * "\n}", null, true, null);
-					 * return;
-					 */
-
-				}
-				// else, generate nothing
-				else {
-					return;
-				}
-
-				buffer.append(type.getElementName());
-
-				if (type.getSuperClass() != null) {
-					buffer.append(" extends ");
-					buffer.append(type.getSuperClass().getElementName());
-
-				}
-
-				if (type.getSuperInterfaces() != null && type.getSuperInterfaces().size() > 0) {
-					if (type.isInterface()) {
-						buffer.append(" extends ");
-					} else {
-						buffer.append(" implements ");
-					}
-
-					int i = 0;
-					for (JDTType superInterface : type.getSuperInterfaces()) {
-						if (i != 0) {
-							buffer.append(", ");
-						}
-						buffer.append(superInterface.getElementName());
-						i++;
-					}
-				}
-
-				it = createType(buffer.toString() + " { \n\n}", null, true, null);
-			}
-
-			// add imports
-			if (type.getSuperClass() != null) {
-				SynchTools.createImport(it, type, type.getSuperClass());
-			}
-
-			if (type.getSuperInterfaces() != null) {
-				for (JDTType superInterface : type.getSuperInterfaces()) {
-					SynchTools.createImport(it, type, superInterface);
-				}
-			}
-
-
-
-			// add javaDoc comment
-			if (type.getComment() != null && !type.getComment().isEmpty()) {
-				createJavaDocFor(it, it.getCompilationUnit(), type.getComment(), "");
-			}
-
-
-			// generate field
-			if (!type.isEnum()) {
-				JDTVisitor visitor = new SynchJDTField(it, preference);
-				for (JDTField field : type.getFields()) {
-					field.accept(visitor);
-				}
-			}
-
-			// generate getters and setters
-			JDTVisitor vgettersetter = new SynchJDTGetterSetter(it, preference);
-			if (type.isClass()) {
-				for (JDTField field : type.getFields()) {
-					field.accept(vgettersetter);
-				}
-			}
-
-
-			// generate method
-			JDTVisitor vmethod = new SynchJDTMethod(it, preference);
-			for (JDTMethod method : type.getMethods()) {
-				method.accept(vmethod);
-			}
-
-			// The class implements interface methods only if it's not an abstract class
-			if (!Flags.isAbstract(type.getFlags())) {
-
-				// recover the superclass
-				JDTType superClass = type.getSuperClass();
-
-				// recover the interfaces
-				List<JDTType> allSuperInterfaces = getAllSuperInterfaces(type);
-
-				// Implement the abstract methods of the superClass (recursive method)
-				if (preference.implementMethodsOfAbstractClass()) {
-					implementSuperClassAbstractMethods(it, superClass);
-				}
-
-				// implements interfaces methods of the super-interfaces
-				if (preference.implementMethodsOfIntefaces()) {
-					for (JDTType superInterface : allSuperInterfaces) {
-						for (JDTMethod superInterfaceMethod : superInterface.getMethods()) {
-							superInterfaceMethod.accept(vmethod);
-						}
-					}
-				}
-			}
-
-
-			// generate nested class
-			JDTVisitor vClass = new SynchJDTType(it, preference);
-			for (JDTType child : type.getTypes()) {
-				child.accept(vClass);
-			}
-
-			// Generate explicit imports
-			generateExplicitImports(type, it);
-
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-			throw new JDTVisitorException(e.getMessage(), e.getCause());
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new JDTVisitorException(e.getMessage(), e.getCause());
-		}
-
-
-	}
-
-	/**
-	 * Generate imports that are explicitly declared in the type
-	 *
-	 * @param it
-	 *            The jdt type to be generated
-	 * @throws JavaModelException
-	 * @throws JDTVisitorException
-	 */
-	private void generateExplicitImports(JDTType containerType, IType it) throws JDTVisitorException {
-
-
-		// Add explicit type
-		for (JDTType anImport : containerType.getExplicitRequiredImports()) {
-			try {
-				it.getCompilationUnit().createImport(anImport.getQualifiedName(), null, null);
-			} catch (Exception e) {
-				propagateException(it.getFullyQualifiedName() + "Can't add explicit import " + anImport.getQualifiedName(), e);
-			}
-		}
-
-		// Add explicit plain text types
-		for (String anImport : containerType.getExplicitPlainTextRequiredImports()) {
-			try {
-				it.getCompilationUnit().createImport(anImport, null, null);
-			} catch (JavaModelException e) {
-				propagateException(it.getFullyQualifiedName() + "Can't add explicit plain text import " + anImport, e);
-			}
-		}
-
-	}
-
-	/**
-	 * get current type
-	 *
-	 * @return
-	 * @throws JavaModelException
-	 */
-	private IType[] getTypes() throws JavaModelException {
-		if (icu != null) {
-			return icu.getTypes();
-		}
-		return itype.getTypes();
-	}
-
-	/**
-	 * create type for a element 'sibling'
-	 *
-	 * @param contents
-	 *            the source contents of the type declaration to add
-	 * @param sibling
-	 *            the existing element which the type will be inserted immediately before (if null, then this type will be inserted as the last type
-	 *            declaration
-	 * @param force
-	 *            a flag in case the same name already exists in this type
-	 * @param monitor
-	 *            the progress monitor to notify
-	 * @return the newly inserted type
-	 * @throws JavaModelException
-	 */
-	private IType createType(String contents, IJavaElement sibling, boolean force, IProgressMonitor monitor) throws JavaModelException
-	{
-		if (icu != null) {
-			return icu.createType(contents, sibling, force, monitor);
-		}
-
-		return itype.createType(contents, sibling, force, monitor);
-	}
-
-
-	@Override
-	protected TypeDeclaration searchElementToInsert(CompilationUnit cu, IJavaElement typeName) {
-		if (!(cu.types().get(0) instanceof TypeDeclaration)) {
-			return null;
-		}
-		TypeDeclaration classType = (TypeDeclaration) cu.types().get(0);
-		return searchType(classType, typeName.getElementName());
-
-	}
-
-	@Override
-	protected List<String> getJavadocTags() {
-		List<String> lst = new LinkedList<String>();
-		lst.add(TagElement.TAG_AUTHOR);
-		return lst;
-	}
-
-	/**
-	 * Collect all super interfaces from the super class and the super interfaces (JDTType). Recursive method.
-	 *
-	 * @param superClass
-	 * @return List of all super interfaces
-	 */
-	public List<JDTType> getAllSuperInterfaces(JDTType _type) {
-		List<JDTType> superInterfaces = new LinkedList<JDTType>();
-
-		// recover its own interfaces
-		superInterfaces.addAll(_type.getSuperInterfaces());
-
-		// add interfaces of the super class if it's abstract
-		if (_type.getSuperClass() != null && _type.getSuperClass().isAbstract()) {
-			superInterfaces.addAll(getAllSuperInterfaces(_type.getSuperClass()));
-		}
-
-		// add interfaces of the super interfaces
-		for (JDTType superInterface : _type.getSuperInterfaces()) {
-			superInterfaces.addAll(getAllSuperInterfaces(superInterface));
-		}
-
-		return superInterfaces;
-	}
-
-	/**
-	 * Implement the abstract methods of the superClass if the superClass is abstract. It's a recursive method on the super class of the super class.
-	 *
-	 * @param it
-	 * @param superClass
-	 * @throws JDTVisitorException
-	 */
-	public void implementSuperClassAbstractMethods(IType it, JDTType superClass) throws JDTVisitorException {
-		if (superClass == null) {
-			return;
-		}
-
-		JDTVisitor vmethod = new SynchJDTMethod(it, preference);
-
-		if (Flags.isAbstract(superClass.getFlags())) {
-			for (JDTMethod superClassAbstractMethod : superClass.getMethods()) {
-				// Skip if method is not abstract
-				if (!superClassAbstractMethod.isAbstract()) {
-					continue;
-				}
-				// Remove the abstract flag to not generate the method with the keyword "abstract"
-				superClassAbstractMethod.setAbstract(false);
-				superClassAbstractMethod.accept(vmethod);
-				superClassAbstractMethod.setAbstract(true);
-			}
-
-			// Recursive call on the super class of superClass
-			JDTType superClassSuperClass = superClass.getSuperClass();
-			if (superClassSuperClass != null) {
-				implementSuperClassAbstractMethods(it, superClassSuperClass);
-			}
-		}
-	}
-
-	/**
-	 * Propagate a {@link JDTVisitorException} if the flag is not set
-	 *
-	 * @param msg
-	 * @param e
-	 * @throws JDTVisitorException
-	 */
-	private void propagateException(String msg, Throwable e) throws JDTVisitorException {
-
-		if (preference.stopOnFirstError()) {
-			throw new JDTVisitorException(msg, e.getCause());
-		}
-		else {
-			// Show error
-			System.err.println(msg);
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchTools.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchTools.java
deleted file mode 100644
index b7b3e91..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer/src/org/eclipse/papyrus/designer/languages/java/generator/jdtsynchronizer/impl/SynchTools.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Initial API and implementation
- * 	Manuel Giles	 giles.manu@live.fr		 - Initial API and implementation
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Idea of the java generator project & help for the conception
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.impl;
-
-
-
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.papyrus.designer.languages.java.generator.jdtsynchronizer.GeneratorPreference;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTMember;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTType;
-
-/**
- * gathers all the util function to synchronize with JDT
- *
- * @author Nicolas Deblock and Manuel Giles
- *
- */
-public class SynchTools {
-
-
-	/**
-	 * Find a IJavaElement in a list of IJavaElement
-	 * It's util to search a children of a IJavaElement
-	 *
-	 * @param <U>
-	 *            a IJavaElement
-	 * @param lstElement
-	 *            list of IJavaElement
-	 * @param elementName
-	 *            name of IJavaElement which is search
-	 * @return the element who is search, null if there is no element find
-	 */
-	public static <U extends IJavaElement> U searchIJavaElement(U[] lstElement, String elementName) {
-		for (U e : lstElement) {
-			if (e.getElementName().equals(elementName)) {
-				return e;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * return the visibility of jdtMember :
-	 * public or private or protected, abstract, static, final, synchronized
-	 *
-	 * @param jdtMember
-	 * @return visibility of jdtMember
-	 */
-	public static String getVisibility(JDTMember jdtMember) {
-		StringBuffer buffer = new StringBuffer();
-
-		if (Flags.isPublic(jdtMember.getFlags())) {
-			buffer.append("public ");
-		}
-		if (Flags.isPrivate(jdtMember.getFlags())) {
-			buffer.append("private ");
-		}
-		if (Flags.isProtected(jdtMember.getFlags())) {
-			buffer.append("protected ");
-		}
-
-		if (Flags.isAbstract(jdtMember.getFlags())) {
-			buffer.append("abstract ");
-		}
-
-		if (Flags.isStatic(jdtMember.getFlags())) {
-			buffer.append("static ");
-		}
-		if (Flags.isFinal(jdtMember.getFlags())) {
-			buffer.append("final ");
-		}
-		if (Flags.isSynchronized(jdtMember.getFlags())) {
-			buffer.append("synchronized ");
-		}
-		return buffer.toString();
-	}
-
-	/**
-	 * allow to know if a type is primitive
-	 *
-	 * @param typename
-	 * @return true if typename is a primive type
-	 */
-	public static boolean isPrimiveType(String typename) {
-		if (typename.equals("byte")) {
-			return true;
-		}
-		if (typename.equals("char")) {
-			return true;
-		}
-		if (typename.equals("double")) {
-			return true;
-		}
-		if (typename.equals("float")) {
-			return true;
-		}
-		if (typename.equals("int")) {
-			return true;
-		}
-		if (typename.equals("long")) {
-			return true;
-		}
-		if (typename.equals("short")) {
-			return true;
-		}
-		if (typename.equals("boolean")) {
-			return true;
-		}
-		if (typename.equals("String")) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Check if a name represents a pure Java primitive type.
-	 * Pure Java primitive type are Java primitive types that are keywords and not Classes (ie excluding String).
-	 * 
-	 *
-	 * @param typename
-	 * @return true if typename is a primive type
-	 */
-	public static boolean isPureJavaPrimiveType(String typename) {
-		if (typename.equals("byte")) {
-			return true;
-		}
-		if (typename.equals("char")) {
-			return true;
-		}
-		if (typename.equals("double")) {
-			return true;
-		}
-		if (typename.equals("float")) {
-			return true;
-		}
-		if (typename.equals("int")) {
-			return true;
-		}
-		if (typename.equals("long")) {
-			return true;
-		}
-		if (typename.equals("short")) {
-			return true;
-		}
-		if (typename.equals("boolean")) {
-			return true;
-		}
-		if (typename.equals("String")) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * return the default return of a type (ex: 0 for a int, false for a boolean, null for a class,...)
-	 *
-	 * @param typename
-	 * @return true if typename is a primive type
-	 */
-	public static String defaultReturn(String typename) {
-		if (typename.equals("byte")) {
-			return "0";
-		}
-		if (typename.equals("char")) {
-			return "0";
-		}
-		if (typename.equals("double")) {
-			return "0";
-		}
-		if (typename.equals("float")) {
-			return "0";
-		}
-		if (typename.equals("int")) {
-			return "0";
-		}
-		if (typename.equals("long")) {
-			return "0";
-		}
-		if (typename.equals("short")) {
-			return "0";
-		}
-		if (typename.equals("boolean")) {
-			return "false";
-		}
-
-		return "null";
-	}
-
-	/**
-	 * return the Class of a primitive type (ex : int => Integer)
-	 *
-	 * @param typename
-	 * @return true if typename is a primive type
-	 */
-	private static String getPrimiveTypeClass(String typename) {
-		if (typename.equals("byte")) {
-			return "Byte";
-		}
-		if (typename.equals("char")) {
-			return "Character";
-		}
-		if (typename.equals("double")) {
-			return "Double";
-		}
-		if (typename.equals("float")) {
-			return "Float";
-		}
-		if (typename.equals("int")) {
-			return "Integer";
-		}
-		if (typename.equals("long")) {
-			return "Long";
-		}
-		if (typename.equals("short")) {
-			return "Short";
-		}
-		if (typename.equals("boolean")) {
-			return "Boolean";
-		}
-		return typename;
-	}
-
-
-	public static String getPackageFragment(JDTType type) {
-		try {
-			if (type.getCompilationUnit() != null) {
-				return type.getCompilationUnit().getPackageFragment().getQualifiedName();
-			} else {
-				return getPackageFragment(type.getOwner());
-			}
-		} catch (NullPointerException e) {
-			// id null pointer exception, we return null
-			return null;
-		}
-	}
-
-	public static void createImport(IType itype, JDTType currentType, JDTType importType) throws JavaModelException {
-		String packageCurrentType = getPackageFragment(currentType);
-		String packageImportType = getPackageFragment(importType);
-
-		// if no package to import, stop
-		if (packageImportType == null) {
-			return;
-		}
-
-
-		// if they have the same package, and if it is not a nested class, we stop
-		if (packageCurrentType != null && importType.getCompilationUnit() != null && packageCurrentType.equals(packageImportType)) {
-			return;
-		}
-
-		// Check if the last segment name is not a primitive name.
-		// Stop if it is the case (otherwise createImport() throw an exception)
-		if( isPureJavaPrimiveType(importType.getElementName())) {
-			return;
-		}
-		
-		String _import = importType.getQualifiedName();
-		if (!SynchTools.isPrimiveType(_import) && _import.contains(".")) {
-			itype.getCompilationUnit().createImport(_import, null, null);
-		}
-	}
-
-	/**
-	 * Get the multivalued declaration for the specified typeName.
-	 *
-	 * @param type
-	 *            The enclosing type that will contains the declaration. Requested to ajust import.
-	 * @param typeName
-	 *            The type for wich a multivalued statement is requested
-	 * @param preference
-	 *            The preferences
-	 * @return The multivalued statement for the specified typeName.
-	 *
-	 * @throws JavaModelException
-	 */
-	public static String getMultiValued(IType type, String typeName, GeneratorPreference preference) throws JavaModelException {
-		// create the import
-		String _classQualifiedName = preference.genericClassForMultiValue();
-		String _class = _classQualifiedName.substring(_classQualifiedName.lastIndexOf(".") + 1);
-
-		type.getCompilationUnit().createImport(_classQualifiedName, null, null);
-		return _class + "<" + getPrimiveTypeClass(typeName) + ">";
-	}
-
-	/**
-	 * Get the multivalued declaration for the specified typeName.
-	 *
-	 * @param type
-	 *            The enclosing type that will contains the declaration. Requested to ajust import.
-	 * @param typeName
-	 *            The type for wich a multivalued statement is requested
-	 * @param preference
-	 *            The preferences
-	 * @return The multivalued statement for the specified typeName.
-	 *
-	 * @throws JavaModelException
-	 */
-	public static String getMultiValued(IType type, JDTType valueType, GeneratorPreference preference) throws JavaModelException {
-		// create the import
-		String _classQualifiedName = preference.genericClassForMultiValue();
-		String _class = _classQualifiedName.substring(_classQualifiedName.lastIndexOf(".") + 1);
-
-		type.getCompilationUnit().createImport(_classQualifiedName, null, null);
-		return _class + "<" + getPrimiveTypeClass(valueType.getElementName()) + ">";
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.classpath b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.classpath
deleted file mode 100644
index c72d35a..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.project b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.project
deleted file mode 100644
index 190e28c..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.core.resources.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.core.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94d61f0..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.ui.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281d..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.m2e.core.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/META-INF/MANIFEST.MF b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index a2066eb..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.provider,
- org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt;bundle-version="0.7.0";visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.uml2.common.edit;visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.0.2
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.provider.GeneratoroptionsmmEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/about.html b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/about.html
deleted file mode 100644
index d35d5ae..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/build.properties b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/build.properties
deleted file mode 100644
index b686a6b..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTClass.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTClass.gif
deleted file mode 100644
index 5b6f7bd..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTClass.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTEnum.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTEnum.gif
deleted file mode 100644
index b736461..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTEnum.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTInterface.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTInterface.gif
deleted file mode 100644
index fb66338..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTInterface.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTType.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTType.gif
deleted file mode 100644
index f7c61c2..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTCompilationUnit_types_JDTType.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaModel_javaProject_JDTJavaProject.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaModel_javaProject_JDTJavaProject.gif
deleted file mode 100644
index 41c86b3..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaModel_javaProject_JDTJavaProject.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaProject_packageFragmentRoots_JDTPackageFragmentRoot.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaProject_packageFragmentRoots_JDTPackageFragmentRoot.gif
deleted file mode 100644
index 07adaab..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTJavaProject_packageFragmentRoots_JDTPackageFragmentRoot.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMember_typeParameters_JDTTypeParameter.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMember_typeParameters_JDTTypeParameter.gif
deleted file mode 100644
index c3c4510..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMember_typeParameters_JDTTypeParameter.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_JDTOpaqueBody.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_JDTOpaqueBody.gif
deleted file mode 100644
index e5d4d73..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_JDTOpaqueBody.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_OpaqueMethodBody.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_OpaqueMethodBody.gif
deleted file mode 100644
index d5f8c8d..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_bodies_OpaqueMethodBody.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_parameters_JDTParameter.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_parameters_JDTParameter.gif
deleted file mode 100644
index d7724b60..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_parameters_JDTParameter.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_returnType_JDTParameter.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_returnType_JDTParameter.gif
deleted file mode 100644
index d7724b60..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTMethod_returnType_JDTParameter.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragmentRoot_packageFragments_JDTPackageFragment.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragmentRoot_packageFragments_JDTPackageFragment.gif
deleted file mode 100644
index 932fde3..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragmentRoot_packageFragments_JDTPackageFragment.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_compilationUnits_JDTCompilationUnit.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_compilationUnits_JDTCompilationUnit.gif
deleted file mode 100644
index 9531433..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_compilationUnits_JDTCompilationUnit.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_packageFragments_JDTPackageFragment.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_packageFragments_JDTPackageFragment.gif
deleted file mode 100644
index df3eebc..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTPackageFragment_packageFragments_JDTPackageFragment.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_fields_JDTField.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_fields_JDTField.gif
deleted file mode 100644
index 2c2ef1f..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_fields_JDTField.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_methods_JDTMethod.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_methods_JDTMethod.gif
deleted file mode 100644
index a64a033..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_methods_JDTMethod.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTClass.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTClass.gif
deleted file mode 100644
index e5f323d..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTClass.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTEnum.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTEnum.gif
deleted file mode 100644
index a6e5cfd..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTEnum.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTInterface.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTInterface.gif
deleted file mode 100644
index 2f6d3eb..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTInterface.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTType.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTType.gif
deleted file mode 100644
index 11148cf..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/ctool16/CreateJDTType_types_JDTType.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTClass.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTClass.gif
deleted file mode 100644
index 10d2229..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTClass.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTCompilationUnit.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTCompilationUnit.gif
deleted file mode 100644
index 05dc74a..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTCompilationUnit.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTEnum.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTEnum.gif
deleted file mode 100644
index ed87474..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTEnum.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTException.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTException.gif
deleted file mode 100644
index c4fb30e..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTException.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTField.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTField.gif
deleted file mode 100644
index 1e5345f..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTField.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportContainer.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportContainer.gif
deleted file mode 100644
index 53500da..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportContainer.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportDeclaration.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportDeclaration.gif
deleted file mode 100644
index d3dc5a9..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTImportDeclaration.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTInterface.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTInterface.gif
deleted file mode 100644
index c3370c7..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTInterface.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaElement.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaElement.gif
deleted file mode 100644
index 94c953e..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaElement.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaModel.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaModel.gif
deleted file mode 100644
index 4365960..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaModel.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaProject.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaProject.gif
deleted file mode 100644
index a26660e..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTJavaProject.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTMethod.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTMethod.gif
deleted file mode 100644
index 30f0c48..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTMethod.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTOpaqueBody.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTOpaqueBody.gif
deleted file mode 100644
index 5a9bc75..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTOpaqueBody.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragment.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragment.gif
deleted file mode 100644
index c414fe9..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragment.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragmentRoot.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragmentRoot.gif
deleted file mode 100644
index 48e3cf2..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTPackageFragmentRoot.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTParameter.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTParameter.gif
deleted file mode 100644
index 7c2aaac..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTParameter.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTTypeParameter.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTTypeParameter.gif
deleted file mode 100644
index 94c953e..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/JDTTypeParameter.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/OpaqueMethodBody.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/OpaqueMethodBody.gif
deleted file mode 100644
index 98b351f..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/OpaqueMethodBody.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/Options.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/Options.gif
deleted file mode 100644
index cdd3b76..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/icons/full/obj16/Options.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/plugin.properties b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/plugin.properties
deleted file mode 100644
index 2f93b95..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/plugin.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-
-pluginName = Jdt metamodel Edit Support (Incubation)
-providerName = Eclipse Modeling Project
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_Options_type = Options
-_UI_Unknown_type = Object
-
-_UI_Unknown_datatype= Value
-
-_UI_Options_defaultSourceFolder_feature = Default Source Folder
-_UI_Unknown_feature = Unspecified
-
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/plugin.xml b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/plugin.xml
deleted file mode 100644
index 3a81239..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated generatoroptionsmm -->
-      <factory
-            uri="http:///GeneratorOptionsMM.ecore"
-            class="org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.provider.GeneratoroptionsmmItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-</plugin>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/pom.xml b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/pom.xml
deleted file mode 100644
index 0c7d27b..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus.designer</groupId>
-		<artifactId>org.eclipse.papyrus.designer.languages.java</artifactId>
-		<version>1.0.2</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<description>This module contains an internal Java meta model (edit part)</description>
-</project>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmEditPlugin.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmEditPlugin.java
deleted file mode 100644
index 01a8db9..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmEditPlugin.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Generatoroptionsmm edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public final class GeneratoroptionsmmEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final GeneratoroptionsmmEditPlugin INSTANCE = new GeneratoroptionsmmEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public GeneratoroptionsmmEditPlugin() {
-		super(new ResourceLocator[] {
-				});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmItemProviderAdapterFactory.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmItemProviderAdapterFactory.java
deleted file mode 100644
index 0ee0169..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/provider/GeneratoroptionsmmItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.util.GeneratoroptionsmmAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class GeneratoroptionsmmItemProviderAdapterFactory extends GeneratoroptionsmmAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public GeneratoroptionsmmItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.Options} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected OptionsItemProvider optionsItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.Options}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createOptionsAdapter() {
-		if (optionsItemProvider == null) {
-			optionsItemProvider = new OptionsItemProvider(this);
-		}
-
-		return optionsItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		if (optionsItemProvider != null) {
-			optionsItemProvider.dispose();
-		}
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/provider/OptionsItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/provider/OptionsItemProvider.java
deleted file mode 100644
index 092d5d5..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/provider/OptionsItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.GeneratoroptionsmmPackage;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.Options;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.Options} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class OptionsItemProvider
-		extends ItemProviderAdapter
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public OptionsItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDefaultSourceFolderPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Default Source Folder feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addDefaultSourceFolderPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Options_defaultSourceFolder_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Options_defaultSourceFolder_feature", "_UI_Options_type"),
-						GeneratoroptionsmmPackage.Literals.OPTIONS__DEFAULT_SOURCE_FOLDER,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns Options.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Options"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Options) object).getDefaultSourceFolder();
-		return label == null || label.length() == 0 ?
-				getString("_UI_Options_type") :
-				getString("_UI_Options_type") + " " + label;
-	}
-
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Options.class)) {
-		case GeneratoroptionsmmPackage.OPTIONS__DEFAULT_SOURCE_FOLDER:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GeneratoroptionsmmEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTClassItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTClassItemProvider.java
deleted file mode 100644
index 433d77c..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTClassItemProvider.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTClass;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTClass} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTClassItemProvider
-		extends JDTTypeItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTClassItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns JDTClass.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTClass"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTClass) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTClass_type") :
-				getString("_UI_JDTClass_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTCompilationUnitItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTCompilationUnitItemProvider.java
deleted file mode 100644
index aa16d2e..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTCompilationUnitItemProvider.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTCompilationUnit;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmFactory;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-import org.eclipse.uml2.common.edit.command.SubsetAddCommand;
-import org.eclipse.uml2.common.edit.command.SubsetSupersetReplaceCommand;
-import org.eclipse.uml2.common.edit.command.SupersetRemoveCommand;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTCompilationUnit} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTCompilationUnitItemProvider
-		extends JDTTypeRootItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTCompilationUnitItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_COMPILATION_UNIT__TYPES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns JDTCompilationUnit.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTCompilationUnit"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTCompilationUnit) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTCompilationUnit_type") :
-				getString("_UI_JDTCompilationUnit_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTCompilationUnit.class)) {
-		case JdtmmPackage.JDT_COMPILATION_UNIT__TYPES:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_COMPILATION_UNIT__TYPES,
-						JdtmmFactory.eINSTANCE.createJDTClass()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_COMPILATION_UNIT__TYPES,
-						JdtmmFactory.eINSTANCE.createJDTInterface()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_COMPILATION_UNIT__TYPES,
-						JdtmmFactory.eINSTANCE.createJDTEnum()));
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createAddCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection, int)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection, int index) {
-		if (feature == JdtmmPackage.Literals.JDT_COMPILATION_UNIT__TYPES) {
-			return new SubsetAddCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, collection, index);
-		}
-		return super.createAddCommand(domain, owner, feature, collection, index);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createRemoveCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection) {
-		if (feature == JdtmmPackage.Literals.JDT_PARENT__CHILDREN) {
-			return new SupersetRemoveCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_COMPILATION_UNIT__TYPES }, collection);
-		}
-		return super.createRemoveCommand(domain, owner, feature, collection);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createReplaceCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecore.EObject, java.util.Collection)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createReplaceCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, EObject value, Collection<?> collection) {
-		if (feature == JdtmmPackage.Literals.JDT_COMPILATION_UNIT__TYPES) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, null, value, collection);
-		}
-		if (feature == JdtmmPackage.Literals.JDT_PARENT__CHILDREN) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, null, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_COMPILATION_UNIT__TYPES }, value, collection);
-		}
-		return super.createReplaceCommand(domain, owner, feature, value, collection);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTEnumItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTEnumItemProvider.java
deleted file mode 100644
index c01d561..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTEnumItemProvider.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTEnum;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTEnum} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTEnumItemProvider
-		extends JDTTypeItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTEnumItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns JDTEnum.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTEnum"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTEnum) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTEnum_type") :
-				getString("_UI_JDTEnum_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTExceptionItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTExceptionItemProvider.java
deleted file mode 100644
index d3cdf9f..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTExceptionItemProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTException} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTExceptionItemProvider
-		extends ItemProviderAdapter
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTExceptionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns JDTException.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTException"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_JDTException_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return JdtmmEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTFieldItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTFieldItemProvider.java
deleted file mode 100644
index 9e56b26..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTFieldItemProvider.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTField;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTField} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTFieldItemProvider
-		extends JDTMemberItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTFieldItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAbstractPropertyDescriptor(object);
-			addFinalPropertyDescriptor(object);
-			addStaticPropertyDescriptor(object);
-			addIsMultiValuedPropertyDescriptor(object);
-			addTypePropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-			addGenerateGetterPropertyDescriptor(object);
-			addGenerateSetterPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Abstract feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addAbstractPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTField_abstract_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTField_abstract_feature", "_UI_JDTField_type"),
-						JdtmmPackage.Literals.JDT_FIELD__ABSTRACT,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Final feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addFinalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTField_final_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTField_final_feature", "_UI_JDTField_type"),
-						JdtmmPackage.Literals.JDT_FIELD__FINAL,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Static feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addStaticPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTField_static_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTField_static_feature", "_UI_JDTField_type"),
-						JdtmmPackage.Literals.JDT_FIELD__STATIC,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Multi Valued feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addIsMultiValuedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTField_isMultiValued_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTField_isMultiValued_feature", "_UI_JDTField_type"),
-						JdtmmPackage.Literals.JDT_FIELD__IS_MULTI_VALUED,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTField_type_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTField_type_feature", "_UI_JDTField_type"),
-						JdtmmPackage.Literals.JDT_FIELD__TYPE,
-						true,
-						false,
-						true,
-						null,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTField_value_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTField_value_feature", "_UI_JDTField_type"),
-						JdtmmPackage.Literals.JDT_FIELD__VALUE,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Generate Getter feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addGenerateGetterPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTField_generateGetter_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTField_generateGetter_feature", "_UI_JDTField_type"),
-						JdtmmPackage.Literals.JDT_FIELD__GENERATE_GETTER,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Generate Setter feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addGenerateSetterPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTField_generateSetter_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTField_generateSetter_feature", "_UI_JDTField_type"),
-						JdtmmPackage.Literals.JDT_FIELD__GENERATE_SETTER,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns JDTField.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTField"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTField) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTField_type") :
-				getString("_UI_JDTField_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTField.class)) {
-		case JdtmmPackage.JDT_FIELD__ABSTRACT:
-		case JdtmmPackage.JDT_FIELD__FINAL:
-		case JdtmmPackage.JDT_FIELD__STATIC:
-		case JdtmmPackage.JDT_FIELD__IS_MULTI_VALUED:
-		case JdtmmPackage.JDT_FIELD__VALUE:
-		case JdtmmPackage.JDT_FIELD__GENERATE_GETTER:
-		case JdtmmPackage.JDT_FIELD__GENERATE_SETTER:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTImportContainerItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTImportContainerItemProvider.java
deleted file mode 100644
index 14005e1..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTImportContainerItemProvider.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTImportContainer;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTImportContainer} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTImportContainerItemProvider
-		extends JDTParentJavaElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTImportContainerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns JDTImportContainer.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTImportContainer"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTImportContainer) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTImportContainer_type") :
-				getString("_UI_JDTImportContainer_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTImportDeclarationItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTImportDeclarationItemProvider.java
deleted file mode 100644
index 5e109f6..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTImportDeclarationItemProvider.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTImportDeclaration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTImportDeclaration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTImportDeclarationItemProvider
-		extends JDTJavaElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTImportDeclarationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns JDTImportDeclaration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTImportDeclaration"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTImportDeclaration) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTImportDeclaration_type") :
-				getString("_UI_JDTImportDeclaration_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTInterfaceItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTInterfaceItemProvider.java
deleted file mode 100644
index 95b9e5b..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTInterfaceItemProvider.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTInterface;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTInterface} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTInterfaceItemProvider
-		extends JDTTypeItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTInterfaceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns JDTInterface.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTInterface"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTInterface) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTInterface_type") :
-				getString("_UI_JDTInterface_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaElementItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaElementItemProvider.java
deleted file mode 100644
index 6f3af3f..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaElementItemProvider.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTJavaElementItemProvider
-		extends ItemProviderAdapter
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTJavaElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addElementNamePropertyDescriptor(object);
-			addElementTypePropertyDescriptor(object);
-			addCommentPropertyDescriptor(object);
-			addGeneratedPropertyDescriptor(object);
-			addParentPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Parent feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addParentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTJavaElement_parent_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTJavaElement_parent_feature", "_UI_JDTJavaElement_type"),
-						JdtmmPackage.Literals.JDT_JAVA_ELEMENT__PARENT,
-						false,
-						false,
-						false,
-						null,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Element Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addElementNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTJavaElement_elementName_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTJavaElement_elementName_feature", "_UI_JDTJavaElement_type"),
-						JdtmmPackage.Literals.JDT_JAVA_ELEMENT__ELEMENT_NAME,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Element Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addElementTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTJavaElement_elementType_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTJavaElement_elementType_feature", "_UI_JDTJavaElement_type"),
-						JdtmmPackage.Literals.JDT_JAVA_ELEMENT__ELEMENT_TYPE,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Comment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addCommentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTJavaElement_comment_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTJavaElement_comment_feature", "_UI_JDTJavaElement_type"),
-						JdtmmPackage.Literals.JDT_JAVA_ELEMENT__COMMENT,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Generated feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addGeneratedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTJavaElement_generated_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTJavaElement_generated_feature", "_UI_JDTJavaElement_type"),
-						JdtmmPackage.Literals.JDT_JAVA_ELEMENT__GENERATED,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTJavaElement) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTJavaElement_type") :
-				getString("_UI_JDTJavaElement_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTJavaElement.class)) {
-		case JdtmmPackage.JDT_JAVA_ELEMENT__ELEMENT_NAME:
-		case JdtmmPackage.JDT_JAVA_ELEMENT__ELEMENT_TYPE:
-		case JdtmmPackage.JDT_JAVA_ELEMENT__COMMENT:
-		case JdtmmPackage.JDT_JAVA_ELEMENT__GENERATED:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return JdtmmEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaModelItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaModelItemProvider.java
deleted file mode 100644
index baf7001..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaModelItemProvider.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaModel;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmFactory;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaModel} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTJavaModelItemProvider
-		extends JDTParentJavaElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTJavaModelItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_JAVA_MODEL__JAVA_PROJECT);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns JDTJavaModel.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTJavaModel"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTJavaModel) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTJavaModel_type") :
-				getString("_UI_JDTJavaModel_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTJavaModel.class)) {
-		case JdtmmPackage.JDT_JAVA_MODEL__JAVA_PROJECT:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_JAVA_MODEL__JAVA_PROJECT,
-						JdtmmFactory.eINSTANCE.createJDTJavaProject()));
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaProjectItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaProjectItemProvider.java
deleted file mode 100644
index e6c9473..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTJavaProjectItemProvider.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaProject;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmFactory;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-import org.eclipse.uml2.common.edit.command.SubsetAddCommand;
-import org.eclipse.uml2.common.edit.command.SubsetSupersetReplaceCommand;
-import org.eclipse.uml2.common.edit.command.SupersetRemoveCommand;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaProject} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTJavaProjectItemProvider
-		extends JDTParentJavaElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTJavaProjectItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_JAVA_PROJECT__PACKAGE_FRAGMENT_ROOTS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns JDTJavaProject.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTJavaProject"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTJavaProject) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTJavaProject_type") :
-				getString("_UI_JDTJavaProject_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTJavaProject.class)) {
-		case JdtmmPackage.JDT_JAVA_PROJECT__PACKAGE_FRAGMENT_ROOTS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_JAVA_PROJECT__PACKAGE_FRAGMENT_ROOTS,
-						JdtmmFactory.eINSTANCE.createJDTPackageFragmentRoot()));
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createAddCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection, int)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection, int index) {
-		if (feature == JdtmmPackage.Literals.JDT_JAVA_PROJECT__PACKAGE_FRAGMENT_ROOTS) {
-			return new SubsetAddCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, collection, index);
-		}
-		return super.createAddCommand(domain, owner, feature, collection, index);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createRemoveCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection) {
-		if (feature == JdtmmPackage.Literals.JDT_PARENT__CHILDREN) {
-			return new SupersetRemoveCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_JAVA_PROJECT__PACKAGE_FRAGMENT_ROOTS }, collection);
-		}
-		return super.createRemoveCommand(domain, owner, feature, collection);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createReplaceCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecore.EObject, java.util.Collection)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createReplaceCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, EObject value, Collection<?> collection) {
-		if (feature == JdtmmPackage.Literals.JDT_JAVA_PROJECT__PACKAGE_FRAGMENT_ROOTS) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, null, value, collection);
-		}
-		if (feature == JdtmmPackage.Literals.JDT_PARENT__CHILDREN) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, null, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_JAVA_PROJECT__PACKAGE_FRAGMENT_ROOTS }, value, collection);
-		}
-		return super.createReplaceCommand(domain, owner, feature, value, collection);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTMemberItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTMemberItemProvider.java
deleted file mode 100644
index dd8ab1c..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTMemberItemProvider.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTMember;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmFactory;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTMember} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTMemberItemProvider
-		extends JDTParentJavaElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTMemberItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addVisibilityPropertyDescriptor(object);
-			addExplicitRequiredImportsPropertyDescriptor(object);
-			addExplicitPlainTextRequiredImportsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Visibility feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addVisibilityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTMember_visibility_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTMember_visibility_feature", "_UI_JDTMember_type"),
-						JdtmmPackage.Literals.JDT_MEMBER__VISIBILITY,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Explicit Required Imports feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addExplicitRequiredImportsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTMember_explicitRequiredImports_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTMember_explicitRequiredImports_feature", "_UI_JDTMember_type"),
-						JdtmmPackage.Literals.JDT_MEMBER__EXPLICIT_REQUIRED_IMPORTS,
-						true,
-						false,
-						true,
-						null,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Explicit Plain Text Required Imports feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addExplicitPlainTextRequiredImportsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTMember_explicitPlainTextRequiredImports_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTMember_explicitPlainTextRequiredImports_feature", "_UI_JDTMember_type"),
-						JdtmmPackage.Literals.JDT_MEMBER__EXPLICIT_PLAIN_TEXT_REQUIRED_IMPORTS,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_MEMBER__TYPE_PARAMETERS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTMember) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTMember_type") :
-				getString("_UI_JDTMember_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTMember.class)) {
-		case JdtmmPackage.JDT_MEMBER__VISIBILITY:
-		case JdtmmPackage.JDT_MEMBER__EXPLICIT_PLAIN_TEXT_REQUIRED_IMPORTS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case JdtmmPackage.JDT_MEMBER__TYPE_PARAMETERS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_MEMBER__TYPE_PARAMETERS,
-						JdtmmFactory.eINSTANCE.createJDTTypeParameter()));
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodBodyItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodBodyItemProvider.java
deleted file mode 100644
index 847aeb8..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodBodyItemProvider.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTMethodBody} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTMethodBodyItemProvider
-		extends ItemProviderAdapter
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTMethodBodyItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_JDTMethodBody_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return JdtmmEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodItemProvider.java
deleted file mode 100644
index f888cf4..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTMethodItemProvider.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTMethod;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmFactory;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTMethod} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTMethodItemProvider
-		extends JDTMemberItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTMethodItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAbstractPropertyDescriptor(object);
-			addFinalPropertyDescriptor(object);
-			addStaticPropertyDescriptor(object);
-			addExceptionsPropertyDescriptor(object);
-			addSynchronizedPropertyDescriptor(object);
-			addConstructorPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Abstract feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addAbstractPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTMethod_abstract_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTMethod_abstract_feature", "_UI_JDTMethod_type"),
-						JdtmmPackage.Literals.JDT_METHOD__ABSTRACT,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Final feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addFinalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTMethod_final_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTMethod_final_feature", "_UI_JDTMethod_type"),
-						JdtmmPackage.Literals.JDT_METHOD__FINAL,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Static feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addStaticPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTMethod_static_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTMethod_static_feature", "_UI_JDTMethod_type"),
-						JdtmmPackage.Literals.JDT_METHOD__STATIC,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Exceptions feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addExceptionsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTMethod_exceptions_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTMethod_exceptions_feature", "_UI_JDTMethod_type"),
-						JdtmmPackage.Literals.JDT_METHOD__EXCEPTIONS,
-						true,
-						false,
-						true,
-						null,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Synchronized feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addSynchronizedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTMethod_synchronized_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTMethod_synchronized_feature", "_UI_JDTMethod_type"),
-						JdtmmPackage.Literals.JDT_METHOD__SYNCHRONIZED,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Constructor feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addConstructorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTMethod_constructor_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTMethod_constructor_feature", "_UI_JDTMethod_type"),
-						JdtmmPackage.Literals.JDT_METHOD__CONSTRUCTOR,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_METHOD__RETURN_TYPE);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_METHOD__PARAMETERS);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_METHOD__BODIES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns JDTMethod.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTMethod"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTMethod) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTMethod_type") :
-				getString("_UI_JDTMethod_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTMethod.class)) {
-		case JdtmmPackage.JDT_METHOD__ABSTRACT:
-		case JdtmmPackage.JDT_METHOD__FINAL:
-		case JdtmmPackage.JDT_METHOD__STATIC:
-		case JdtmmPackage.JDT_METHOD__SYNCHRONIZED:
-		case JdtmmPackage.JDT_METHOD__CONSTRUCTOR:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case JdtmmPackage.JDT_METHOD__RETURN_TYPE:
-		case JdtmmPackage.JDT_METHOD__PARAMETERS:
-		case JdtmmPackage.JDT_METHOD__BODIES:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_METHOD__RETURN_TYPE,
-						JdtmmFactory.eINSTANCE.createJDTParameter()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_METHOD__PARAMETERS,
-						JdtmmFactory.eINSTANCE.createJDTParameter()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_METHOD__BODIES,
-						JdtmmFactory.eINSTANCE.createJDTOpaqueBody()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-				childFeature == JdtmmPackage.Literals.JDT_METHOD__RETURN_TYPE ||
-						childFeature == JdtmmPackage.Literals.JDT_METHOD__PARAMETERS;
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2",
-					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTOpaqueBodyItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTOpaqueBodyItemProvider.java
deleted file mode 100644
index 8905346..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTOpaqueBodyItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTOpaqueBody;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTOpaqueBody} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTOpaqueBodyItemProvider
-		extends JDTMethodBodyItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTOpaqueBodyItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			add_bodyPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the body feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void add_bodyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTOpaqueBody__body_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTOpaqueBody__body_feature", "_UI_JDTOpaqueBody_type"),
-						JdtmmPackage.Literals.JDT_OPAQUE_BODY__BODY,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns JDTOpaqueBody.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTOpaqueBody"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTOpaqueBody) object).get_body();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTOpaqueBody_type") :
-				getString("_UI_JDTOpaqueBody_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTOpaqueBody.class)) {
-		case JdtmmPackage.JDT_OPAQUE_BODY__BODY:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentItemProvider.java
deleted file mode 100644
index f05d79f..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentItemProvider.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragment;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmFactory;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-import org.eclipse.uml2.common.edit.command.SubsetAddCommand;
-import org.eclipse.uml2.common.edit.command.SubsetSupersetReplaceCommand;
-import org.eclipse.uml2.common.edit.command.SupersetRemoveCommand;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragment} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTPackageFragmentItemProvider
-		extends JDTParentJavaElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTPackageFragmentItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT__COMPILATION_UNITS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns JDTPackageFragment.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTPackageFragment"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTPackageFragment) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTPackageFragment_type") :
-				getString("_UI_JDTPackageFragment_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTPackageFragment.class)) {
-		case JdtmmPackage.JDT_PACKAGE_FRAGMENT__COMPILATION_UNITS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT__COMPILATION_UNITS,
-						JdtmmFactory.eINSTANCE.createJDTCompilationUnit()));
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createAddCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection, int)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection, int index) {
-		if (feature == JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT__COMPILATION_UNITS) {
-			return new SubsetAddCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, collection, index);
-		}
-		return super.createAddCommand(domain, owner, feature, collection, index);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createRemoveCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection) {
-		if (feature == JdtmmPackage.Literals.JDT_PARENT__CHILDREN) {
-			return new SupersetRemoveCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT__COMPILATION_UNITS }, collection);
-		}
-		return super.createRemoveCommand(domain, owner, feature, collection);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createReplaceCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecore.EObject, java.util.Collection)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createReplaceCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, EObject value, Collection<?> collection) {
-		if (feature == JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT__COMPILATION_UNITS) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, null, value, collection);
-		}
-		if (feature == JdtmmPackage.Literals.JDT_PARENT__CHILDREN) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, null, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT__COMPILATION_UNITS }, value, collection);
-		}
-		return super.createReplaceCommand(domain, owner, feature, value, collection);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentRootItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentRootItemProvider.java
deleted file mode 100644
index ddfd058..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTPackageFragmentRootItemProvider.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragmentRoot;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmFactory;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-import org.eclipse.uml2.common.edit.command.SubsetAddCommand;
-import org.eclipse.uml2.common.edit.command.SubsetSupersetReplaceCommand;
-import org.eclipse.uml2.common.edit.command.SupersetRemoveCommand;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragmentRoot} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTPackageFragmentRootItemProvider
-		extends JDTParentJavaElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTPackageFragmentRootItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT_ROOT__PACKAGE_FRAGMENTS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns JDTPackageFragmentRoot.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTPackageFragmentRoot"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTPackageFragmentRoot) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTPackageFragmentRoot_type") :
-				getString("_UI_JDTPackageFragmentRoot_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTPackageFragmentRoot.class)) {
-		case JdtmmPackage.JDT_PACKAGE_FRAGMENT_ROOT__PACKAGE_FRAGMENTS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT_ROOT__PACKAGE_FRAGMENTS,
-						JdtmmFactory.eINSTANCE.createJDTPackageFragment()));
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createAddCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection, int)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection, int index) {
-		if (feature == JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT_ROOT__PACKAGE_FRAGMENTS) {
-			return new SubsetAddCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, collection, index);
-		}
-		return super.createAddCommand(domain, owner, feature, collection, index);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createRemoveCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection) {
-		if (feature == JdtmmPackage.Literals.JDT_PARENT__CHILDREN) {
-			return new SupersetRemoveCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT_ROOT__PACKAGE_FRAGMENTS }, collection);
-		}
-		return super.createRemoveCommand(domain, owner, feature, collection);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createReplaceCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecore.EObject, java.util.Collection)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createReplaceCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, EObject value, Collection<?> collection) {
-		if (feature == JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT_ROOT__PACKAGE_FRAGMENTS) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, null, value, collection);
-		}
-		if (feature == JdtmmPackage.Literals.JDT_PARENT__CHILDREN) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, null, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PACKAGE_FRAGMENT_ROOT__PACKAGE_FRAGMENTS }, value, collection);
-		}
-		return super.createReplaceCommand(domain, owner, feature, value, collection);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTParameterItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTParameterItemProvider.java
deleted file mode 100644
index 92a53b2..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTParameterItemProvider.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTParameter;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTParameter} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTParameterItemProvider
-		extends JDTMemberItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTParameterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addFinalPropertyDescriptor(object);
-			addIsMultiValuedPropertyDescriptor(object);
-			addTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Final feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addFinalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTParameter_final_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTParameter_final_feature", "_UI_JDTParameter_type"),
-						JdtmmPackage.Literals.JDT_PARAMETER__FINAL,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Is Multi Valued feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addIsMultiValuedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTParameter_isMultiValued_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTParameter_isMultiValued_feature", "_UI_JDTParameter_type"),
-						JdtmmPackage.Literals.JDT_PARAMETER__IS_MULTI_VALUED,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTParameter_type_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTParameter_type_feature", "_UI_JDTParameter_type"),
-						JdtmmPackage.Literals.JDT_PARAMETER__TYPE,
-						true,
-						false,
-						true,
-						null,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns JDTParameter.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTParameter"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTParameter) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTParameter_type") :
-				getString("_UI_JDTParameter_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTParameter.class)) {
-		case JdtmmPackage.JDT_PARAMETER__FINAL:
-		case JdtmmPackage.JDT_PARAMETER__IS_MULTI_VALUED:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTParentItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTParentItemProvider.java
deleted file mode 100644
index 360810b..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTParentItemProvider.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTParent;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTParent} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTParentItemProvider
-		extends ItemProviderAdapter
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTParentItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addChildrenPropertyDescriptor(object);
-			addFlagsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Flags feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addFlagsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTParent_flags_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTParent_flags_feature", "_UI_JDTParent_type"),
-						JdtmmPackage.Literals.JDT_PARENT__FLAGS,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Children feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addChildrenPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTParent_children_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTParent_children_feature", "_UI_JDTParent_type"),
-						JdtmmPackage.Literals.JDT_PARENT__CHILDREN,
-						false,
-						false,
-						false,
-						null,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		JDTParent jdtParent = (JDTParent) object;
-		return getString("_UI_JDTParent_type") + " " + jdtParent.getFlags();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTParent.class)) {
-		case JdtmmPackage.JDT_PARENT__FLAGS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return JdtmmEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTParentJavaElementItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTParentJavaElementItemProvider.java
deleted file mode 100644
index 14347ca..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTParentJavaElementItemProvider.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTParentJavaElement;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTParentJavaElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTParentJavaElementItemProvider
-		extends JDTJavaElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTParentJavaElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addChildrenPropertyDescriptor(object);
-			addFlagsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Flags feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addFlagsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTParent_flags_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTParent_flags_feature", "_UI_JDTParent_type"),
-						JdtmmPackage.Literals.JDT_PARENT__FLAGS,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Children feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addChildrenPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTParent_children_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTParent_children_feature", "_UI_JDTParent_type"),
-						JdtmmPackage.Literals.JDT_PARENT__CHILDREN,
-						false,
-						false,
-						false,
-						null,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTParentJavaElement) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTParentJavaElement_type") :
-				getString("_UI_JDTParentJavaElement_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTParentJavaElement.class)) {
-		case JdtmmPackage.JDT_PARENT_JAVA_ELEMENT__FLAGS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeItemProvider.java
deleted file mode 100644
index 5c78f0b..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeItemProvider.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTType;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmFactory;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JdtmmPackage;
-import org.eclipse.uml2.common.edit.command.SubsetAddCommand;
-import org.eclipse.uml2.common.edit.command.SubsetSupersetReplaceCommand;
-import org.eclipse.uml2.common.edit.command.SupersetRemoveCommand;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTType} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTTypeItemProvider
-		extends JDTMemberItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addClassPropertyDescriptor(object);
-			addInterfacePropertyDescriptor(object);
-			addEnumPropertyDescriptor(object);
-			addAbstractPropertyDescriptor(object);
-			addFinalPropertyDescriptor(object);
-			addStaticPropertyDescriptor(object);
-			addSuperInterfacesPropertyDescriptor(object);
-			addSuperClassPropertyDescriptor(object);
-			addSuperInterfaceNamesPropertyDescriptor(object);
-			addSuperClassNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTType_class_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTType_class_feature", "_UI_JDTType_type"),
-						JdtmmPackage.Literals.JDT_TYPE__CLASS,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Interface feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addInterfacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTType_interface_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTType_interface_feature", "_UI_JDTType_type"),
-						JdtmmPackage.Literals.JDT_TYPE__INTERFACE,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Enum feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addEnumPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTType_enum_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTType_enum_feature", "_UI_JDTType_type"),
-						JdtmmPackage.Literals.JDT_TYPE__ENUM,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Abstract feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addAbstractPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTType_abstract_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTType_abstract_feature", "_UI_JDTType_type"),
-						JdtmmPackage.Literals.JDT_TYPE__ABSTRACT,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Final feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addFinalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTType_final_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTType_final_feature", "_UI_JDTType_type"),
-						JdtmmPackage.Literals.JDT_TYPE__FINAL,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Static feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addStaticPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTType_static_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTType_static_feature", "_UI_JDTType_type"),
-						JdtmmPackage.Literals.JDT_TYPE__STATIC,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Super Interfaces feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addSuperInterfacesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTType_superInterfaces_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTType_superInterfaces_feature", "_UI_JDTType_type"),
-						JdtmmPackage.Literals.JDT_TYPE__SUPER_INTERFACES,
-						true,
-						false,
-						true,
-						null,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Super Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addSuperClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTType_superClass_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTType_superClass_feature", "_UI_JDTType_type"),
-						JdtmmPackage.Literals.JDT_TYPE__SUPER_CLASS,
-						true,
-						false,
-						true,
-						null,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Super Interface Names feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addSuperInterfaceNamesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTType_superInterfaceNames_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTType_superInterfaceNames_feature", "_UI_JDTType_type"),
-						JdtmmPackage.Literals.JDT_TYPE__SUPER_INTERFACE_NAMES,
-						false,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Super Class Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addSuperClassNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_JDTType_superClassName_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_JDTType_superClassName_feature", "_UI_JDTType_type"),
-						JdtmmPackage.Literals.JDT_TYPE__SUPER_CLASS_NAME,
-						false,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_TYPE__METHODS);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_TYPE__FIELDS);
-			childrenFeatures.add(JdtmmPackage.Literals.JDT_TYPE__TYPES);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTType) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTType_type") :
-				getString("_UI_JDTType_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(JDTType.class)) {
-		case JdtmmPackage.JDT_TYPE__CLASS:
-		case JdtmmPackage.JDT_TYPE__INTERFACE:
-		case JdtmmPackage.JDT_TYPE__ENUM:
-		case JdtmmPackage.JDT_TYPE__ABSTRACT:
-		case JdtmmPackage.JDT_TYPE__FINAL:
-		case JdtmmPackage.JDT_TYPE__STATIC:
-		case JdtmmPackage.JDT_TYPE__SUPER_INTERFACE_NAMES:
-		case JdtmmPackage.JDT_TYPE__SUPER_CLASS_NAME:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case JdtmmPackage.JDT_TYPE__METHODS:
-		case JdtmmPackage.JDT_TYPE__FIELDS:
-		case JdtmmPackage.JDT_TYPE__TYPES:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_TYPE__METHODS,
-						JdtmmFactory.eINSTANCE.createJDTMethod()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_TYPE__FIELDS,
-						JdtmmFactory.eINSTANCE.createJDTField()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_TYPE__TYPES,
-						JdtmmFactory.eINSTANCE.createJDTClass()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_TYPE__TYPES,
-						JdtmmFactory.eINSTANCE.createJDTInterface()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(JdtmmPackage.Literals.JDT_TYPE__TYPES,
-						JdtmmFactory.eINSTANCE.createJDTEnum()));
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createAddCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection, int)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createAddCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection, int index) {
-		if (feature == JdtmmPackage.Literals.JDT_TYPE__METHODS) {
-			return new SubsetAddCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, collection, index);
-		}
-		if (feature == JdtmmPackage.Literals.JDT_TYPE__FIELDS) {
-			return new SubsetAddCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, collection, index);
-		}
-		if (feature == JdtmmPackage.Literals.JDT_TYPE__TYPES) {
-			return new SubsetAddCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, collection, index);
-		}
-		return super.createAddCommand(domain, owner, feature, collection, index);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createRemoveCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createRemoveCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, Collection<?> collection) {
-		if (feature == JdtmmPackage.Literals.JDT_PARENT__CHILDREN) {
-			return new SupersetRemoveCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_TYPE__METHODS, JdtmmPackage.Literals.JDT_TYPE__FIELDS, JdtmmPackage.Literals.JDT_TYPE__TYPES }, collection);
-		}
-		return super.createRemoveCommand(domain, owner, feature, collection);
-	}
-
-	/**
-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createReplaceCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecore.EObject, java.util.Collection)
-	 *      <!-- begin-user-doc -->
-	 *      <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected Command createReplaceCommand(EditingDomain domain, EObject owner, EStructuralFeature feature, EObject value, Collection<?> collection) {
-		if (feature == JdtmmPackage.Literals.JDT_TYPE__METHODS) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, null, value, collection);
-		}
-		if (feature == JdtmmPackage.Literals.JDT_TYPE__FIELDS) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, null, value, collection);
-		}
-		if (feature == JdtmmPackage.Literals.JDT_TYPE__TYPES) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_PARENT__CHILDREN }, null, value, collection);
-		}
-		if (feature == JdtmmPackage.Literals.JDT_PARENT__CHILDREN) {
-			return new SubsetSupersetReplaceCommand(domain, owner, feature, null, new EStructuralFeature[] { JdtmmPackage.Literals.JDT_TYPE__METHODS, JdtmmPackage.Literals.JDT_TYPE__FIELDS, JdtmmPackage.Literals.JDT_TYPE__TYPES }, value, collection);
-		}
-		return super.createReplaceCommand(domain, owner, feature, value, collection);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeParameterItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeParameterItemProvider.java
deleted file mode 100644
index 9a712c2..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeParameterItemProvider.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTTypeParameter;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTTypeParameter} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTTypeParameterItemProvider
-		extends JDTJavaElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTTypeParameterItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns JDTTypeParameter.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/JDTTypeParameter"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTTypeParameter) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTTypeParameter_type") :
-				getString("_UI_JDTTypeParameter_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeRootItemProvider.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeRootItemProvider.java
deleted file mode 100644
index 7a3a081..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JDTTypeRootItemProvider.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTTypeRoot;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTTypeRoot} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JDTTypeRootItemProvider
-		extends JDTParentJavaElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JDTTypeRootItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((JDTTypeRoot) object).getElementName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_JDTTypeRoot_type") :
-				getString("_UI_JDTTypeRoot_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JdtmmEditPlugin.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JdtmmEditPlugin.java
deleted file mode 100644
index 7df877f..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JdtmmEditPlugin.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Jdtmm edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public final class JdtmmEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final JdtmmEditPlugin INSTANCE = new JdtmmEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JdtmmEditPlugin() {
-		super(new ResourceLocator[] {
-				});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JdtmmItemProviderAdapterFactory.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JdtmmItemProviderAdapterFactory.java
deleted file mode 100644
index 95068a6..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/jdtmm/provider/JdtmmItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,661 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 Nicolas Deblock & Cedric Dumoulin & Manuel Giles.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	Nicolas Deblock  nico.deblock@gmail.com  - Meta-model conception
- * 	Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Meta-model conception
- * 	Manuel Giles	 giles.manu@live.fr		 - Meta-model conception
- *
- *****************************************************************************/
-
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.util.JdtmmAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JdtmmItemProviderAdapterFactory extends JdtmmAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public JdtmmItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTTypeParameter} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTTypeParameterItemProvider jdtTypeParameterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTTypeParameter}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTTypeParameterAdapter() {
-		if (jdtTypeParameterItemProvider == null) {
-			jdtTypeParameterItemProvider = new JDTTypeParameterItemProvider(this);
-		}
-
-		return jdtTypeParameterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTField} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTFieldItemProvider jdtFieldItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTField}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTFieldAdapter() {
-		if (jdtFieldItemProvider == null) {
-			jdtFieldItemProvider = new JDTFieldItemProvider(this);
-		}
-
-		return jdtFieldItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTMethod} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTMethodItemProvider jdtMethodItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTMethod}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTMethodAdapter() {
-		if (jdtMethodItemProvider == null) {
-			jdtMethodItemProvider = new JDTMethodItemProvider(this);
-		}
-
-		return jdtMethodItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTParameter} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTParameterItemProvider jdtParameterItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTParameter}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTParameterAdapter() {
-		if (jdtParameterItemProvider == null) {
-			jdtParameterItemProvider = new JDTParameterItemProvider(this);
-		}
-
-		return jdtParameterItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTCompilationUnit} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTCompilationUnitItemProvider jdtCompilationUnitItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTCompilationUnit}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTCompilationUnitAdapter() {
-		if (jdtCompilationUnitItemProvider == null) {
-			jdtCompilationUnitItemProvider = new JDTCompilationUnitItemProvider(this);
-		}
-
-		return jdtCompilationUnitItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragment} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTPackageFragmentItemProvider jdtPackageFragmentItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTPackageFragmentAdapter() {
-		if (jdtPackageFragmentItemProvider == null) {
-			jdtPackageFragmentItemProvider = new JDTPackageFragmentItemProvider(this);
-		}
-
-		return jdtPackageFragmentItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragmentRoot} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTPackageFragmentRootItemProvider jdtPackageFragmentRootItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTPackageFragmentRoot}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTPackageFragmentRootAdapter() {
-		if (jdtPackageFragmentRootItemProvider == null) {
-			jdtPackageFragmentRootItemProvider = new JDTPackageFragmentRootItemProvider(this);
-		}
-
-		return jdtPackageFragmentRootItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaProject} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTJavaProjectItemProvider jdtJavaProjectItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaProject}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTJavaProjectAdapter() {
-		if (jdtJavaProjectItemProvider == null) {
-			jdtJavaProjectItemProvider = new JDTJavaProjectItemProvider(this);
-		}
-
-		return jdtJavaProjectItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaModel} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTJavaModelItemProvider jdtJavaModelItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTJavaModel}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTJavaModelAdapter() {
-		if (jdtJavaModelItemProvider == null) {
-			jdtJavaModelItemProvider = new JDTJavaModelItemProvider(this);
-		}
-
-		return jdtJavaModelItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTClass} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTClassItemProvider jdtClassItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTClass}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTClassAdapter() {
-		if (jdtClassItemProvider == null) {
-			jdtClassItemProvider = new JDTClassItemProvider(this);
-		}
-
-		return jdtClassItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTInterface} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTInterfaceItemProvider jdtInterfaceItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTInterface}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTInterfaceAdapter() {
-		if (jdtInterfaceItemProvider == null) {
-			jdtInterfaceItemProvider = new JDTInterfaceItemProvider(this);
-		}
-
-		return jdtInterfaceItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTEnum} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTEnumItemProvider jdtEnumItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTEnum}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTEnumAdapter() {
-		if (jdtEnumItemProvider == null) {
-			jdtEnumItemProvider = new JDTEnumItemProvider(this);
-		}
-
-		return jdtEnumItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTImportDeclaration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTImportDeclarationItemProvider jdtImportDeclarationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTImportDeclaration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTImportDeclarationAdapter() {
-		if (jdtImportDeclarationItemProvider == null) {
-			jdtImportDeclarationItemProvider = new JDTImportDeclarationItemProvider(this);
-		}
-
-		return jdtImportDeclarationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTImportContainer} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTImportContainerItemProvider jdtImportContainerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTImportContainer}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTImportContainerAdapter() {
-		if (jdtImportContainerItemProvider == null) {
-			jdtImportContainerItemProvider = new JDTImportContainerItemProvider(this);
-		}
-
-		return jdtImportContainerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTException} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTExceptionItemProvider jdtExceptionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTException}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTExceptionAdapter() {
-		if (jdtExceptionItemProvider == null) {
-			jdtExceptionItemProvider = new JDTExceptionItemProvider(this);
-		}
-
-		return jdtExceptionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTOpaqueBody} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected JDTOpaqueBodyItemProvider jdtOpaqueBodyItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.jdtmm.JDTOpaqueBody}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createJDTOpaqueBodyAdapter() {
-		if (jdtOpaqueBodyItemProvider == null) {
-			jdtOpaqueBodyItemProvider = new JDTOpaqueBodyItemProvider(this);
-		}
-
-		return jdtOpaqueBodyItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		if (jdtMethodItemProvider != null) {
-			jdtMethodItemProvider.dispose();
-		}
-		if (jdtTypeParameterItemProvider != null) {
-			jdtTypeParameterItemProvider.dispose();
-		}
-		if (jdtFieldItemProvider != null) {
-			jdtFieldItemProvider.dispose();
-		}
-		if (jdtCompilationUnitItemProvider != null) {
-			jdtCompilationUnitItemProvider.dispose();
-		}
-		if (jdtPackageFragmentItemProvider != null) {
-			jdtPackageFragmentItemProvider.dispose();
-		}
-		if (jdtPackageFragmentRootItemProvider != null) {
-			jdtPackageFragmentRootItemProvider.dispose();
-		}
-		if (jdtJavaProjectItemProvider != null) {
-			jdtJavaProjectItemProvider.dispose();
-		}
-		if (jdtJavaModelItemProvider != null) {
-			jdtJavaModelItemProvider.dispose();
-		}
-		if (jdtParameterItemProvider != null) {
-			jdtParameterItemProvider.dispose();
-		}
-		if (jdtClassItemProvider != null) {
-			jdtClassItemProvider.dispose();
-		}
-		if (jdtInterfaceItemProvider != null) {
-			jdtInterfaceItemProvider.dispose();
-		}
-		if (jdtEnumItemProvider != null) {
-			jdtEnumItemProvider.dispose();
-		}
-		if (jdtImportDeclarationItemProvider != null) {
-			jdtImportDeclarationItemProvider.dispose();
-		}
-		if (jdtImportContainerItemProvider != null) {
-			jdtImportContainerItemProvider.dispose();
-		}
-		if (jdtExceptionItemProvider != null) {
-			jdtExceptionItemProvider.dispose();
-		}
-		if (jdtOpaqueBodyItemProvider != null) {
-			jdtOpaqueBodyItemProvider.dispose();
-		}
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.classpath b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.classpath
deleted file mode 100644
index c72d35a..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.project b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.project
deleted file mode 100644
index d631ad9..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.core.resources.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.core.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94d61f0..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.ui.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281d..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.m2e.core.prefs b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/META-INF/MANIFEST.MF b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index e35373e..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.edit;bundle-version="0.7.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.0.2
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.presentation.GeneratoroptionsmmEditorPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.presentation
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/about.html b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/about.html
deleted file mode 100644
index d35d5ae..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>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/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/build.properties b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/build.properties
deleted file mode 100644
index f461025..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin
-src.includes = about.html
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/icons/full/obj16/JdtmmModelFile.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/icons/full/obj16/JdtmmModelFile.gif
deleted file mode 100644
index a99fd81..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/icons/full/obj16/JdtmmModelFile.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/icons/full/wizban/NewJdtmm.gif b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/icons/full/wizban/NewJdtmm.gif
deleted file mode 100644
index 897c9ba..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/icons/full/wizban/NewJdtmm.gif
+++ /dev/null
Binary files differ
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/plugin.properties b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/plugin.properties
deleted file mode 100644
index e799174..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/plugin.properties
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-
-pluginName = Jdt metamodel Editor (Incubation)
-providerName = Eclipse Modeling Project
-
-_UI_GeneratoroptionsmmEditor_menu = &Generatoroptionsmm Editor
-
-_UI_CreateChild_menu_item = &New Child
-_UI_CreateSibling_menu_item = N&ew Sibling
-
-_UI_ShowPropertiesView_menu_item = Show &Properties View
-_UI_RefreshViewer_menu_item = &Refresh
-
-_UI_SelectionPage_label = Selection
-_UI_ParentPage_label = Parent
-_UI_ListPage_label = List
-_UI_TreePage_label = Tree
-_UI_TablePage_label = Table
-_UI_TreeWithColumnsPage_label = Tree with Columns
-_UI_ObjectColumn_label = Object
-_UI_SelfColumn_label = Self
-
-_UI_NoObjectSelected = Selected Nothing
-_UI_SingleObjectSelected = Selected Object: {0}
-_UI_MultiObjectSelected = Selected {0} Objects
-
-_UI_OpenEditorError_label = Open Editor
-
-_UI_Wizard_category = Example EMF Model Creation Wizards
-
-_UI_CreateModelError_message = Problems encountered in file "{0}"
-
-_UI_GeneratoroptionsmmModelWizard_label = Generatoroptionsmm Model
-_UI_GeneratoroptionsmmModelWizard_description = Create a new Generatoroptionsmm model
-
-_UI_GeneratoroptionsmmEditor_label = Generatoroptionsmm Model Editor
-
-_UI_GeneratoroptionsmmEditorFilenameDefaultBase = My
-_UI_GeneratoroptionsmmEditorFilenameExtensions = generatoroptionsmm
-
-_UI_Wizard_label = New
-
-_WARN_FilenameExtension = The file name must end in ''.{0}''
-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
-
-_UI_ModelObject = &Model Object
-_UI_XMLEncoding = &XML Encoding
-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
-_UI_Wizard_initial_object_description = Select a model object to create
-
-_UI_FileConflict_label = File Conflict
-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
-
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/plugin.xml b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/plugin.xml
deleted file mode 100644
index a0e8510..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/plugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
--->
-
-<plugin>
-
-   <extension point="org.eclipse.ui.newWizards">
-      <!-- @generated generatoroptionsmm -->
-      <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
-            name="%_UI_Wizard_category"/>
-      <wizard
-            id="org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.presentation.GeneratoroptionsmmModelWizardID"
-            name="%_UI_GeneratoroptionsmmModelWizard_label"
-            class="org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.presentation.GeneratoroptionsmmModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
-            icon="icons/full/obj16/GeneratoroptionsmmModelFile.gif">
-         <description>%_UI_GeneratoroptionsmmModelWizard_description</description>
-         <selection class="org.eclipse.core.resources.IResource"/>
-      </wizard>
-   </extension>
-
-   <extension point="org.eclipse.ui.editors">
-      <!-- @generated generatoroptionsmm -->
-      <editor
-            id="org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.presentation.GeneratoroptionsmmEditorID"
-            name="%_UI_GeneratoroptionsmmEditor_label"
-            icon="icons/full/obj16/GeneratoroptionsmmModelFile.gif"
-            extensions="generatoroptionsmm"
-            class="org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.presentation.GeneratoroptionsmmEditor"
-            contributorClass="org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.presentation.GeneratoroptionsmmActionBarContributor">
-      </editor>
-   </extension>
-
-</plugin>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/pom.xml b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/pom.xml
deleted file mode 100644
index 27e39d5..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus.designer</groupId>
-		<artifactId>org.eclipse.papyrus.designer.languages.java</artifactId>
-		<version>1.0.2</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<description>This module contains an internal Java meta model</description>
-</project>
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmActionBarContributor.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmActionBarContributor.java
deleted file mode 100644
index b4deda1..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmActionBarContributor.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/**
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.presentation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.ControlAction;
-import org.eclipse.emf.edit.ui.action.CreateChildAction;
-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.action.LoadResourceAction;
-import org.eclipse.emf.edit.ui.action.ValidateAction;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.SubContributionItem;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-/**
- * This is the action bar contributor for the Generatoroptionsmm model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class GeneratoroptionsmmActionBarContributor
-		extends EditingDomainActionBarContributor
-		implements ISelectionChangedListener {
-	/**
-	 * This keeps track of the active editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IEditorPart activeEditorPart;
-
-	/**
-	 * This keeps track of the current selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ISelectionProvider selectionProvider;
-
-	/**
-	 * This action opens the Properties view.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IAction showPropertiesViewAction =
-			new Action(GeneratoroptionsmmEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
-				@Override
-				public void run() {
-					try {
-						getPage().showView("org.eclipse.ui.views.PropertySheet");
-					}
-					catch (PartInitException exception) {
-						GeneratoroptionsmmEditorPlugin.INSTANCE.log(exception);
-					}
-				}
-			};
-
-	/**
-	 * This action refreshes the viewer of the current editor if the editor
-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IAction refreshViewerAction =
-			new Action(GeneratoroptionsmmEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
-				@Override
-				public boolean isEnabled() {
-					return activeEditorPart instanceof IViewerProvider;
-				}
-
-				@Override
-				public void run() {
-					if (activeEditorPart instanceof IViewerProvider) {
-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();
-						if (viewer != null) {
-							viewer.refresh();
-						}
-					}
-				}
-			};
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> createChildActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IMenuManager createChildMenuManager;
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> createSiblingActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IMenuManager createSiblingMenuManager;
-
-	/**
-	 * This creates an instance of the contributor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public GeneratoroptionsmmActionBarContributor() {
-		super(ADDITIONS_LAST_STYLE);
-		loadResourceAction = new LoadResourceAction();
-		validateAction = new ValidateAction();
-		controlAction = new ControlAction();
-	}
-
-	/**
-	 * This adds Separators for editor additions to the tool bar.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator("generatoroptionsmm-settings"));
-		toolBarManager.add(new Separator("generatoroptionsmm-additions"));
-	}
-
-	/**
-	 * This adds to the menu bar a menu and some separators for editor additions,
-	 * as well as the sub-menus for object creation items.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void contributeToMenu(IMenuManager menuManager) {
-		super.contributeToMenu(menuManager);
-
-		IMenuManager submenuManager = new MenuManager(GeneratoroptionsmmEditorPlugin.INSTANCE.getString("_UI_GeneratoroptionsmmEditor_menu"), "org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmmMenuID");
-		menuManager.insertAfter("additions", submenuManager);
-		submenuManager.add(new Separator("settings"));
-		submenuManager.add(new Separator("actions"));
-		submenuManager.add(new Separator("additions"));
-		submenuManager.add(new Separator("additions-end"));
-
-		// Prepare for CreateChild item addition or removal.
-		//
-		createChildMenuManager = new MenuManager(GeneratoroptionsmmEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		submenuManager.insertBefore("additions", createChildMenuManager);
-
-		// Prepare for CreateSibling item addition or removal.
-		//
-		createSiblingMenuManager = new MenuManager(GeneratoroptionsmmEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		submenuManager.insertBefore("additions", createSiblingMenuManager);
-
-		// Force an update because Eclipse hides empty menus now.
-		//
-		submenuManager.addMenuListener
-				(new IMenuListener() {
-					@Override
-					public void menuAboutToShow(IMenuManager menuManager) {
-						menuManager.updateAll(true);
-					}
-				});
-
-		addGlobalActions(submenuManager);
-	}
-
-	/**
-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setActiveEditor(IEditorPart part) {
-		super.setActiveEditor(part);
-		activeEditorPart = part;
-
-		// Switch to the new selection provider.
-		//
-		if (selectionProvider != null) {
-			selectionProvider.removeSelectionChangedListener(this);
-		}
-		if (part == null) {
-			selectionProvider = null;
-		}
-		else {
-			selectionProvider = part.getSite().getSelectionProvider();
-			selectionProvider.addSelectionChangedListener(this);
-
-			// Fake a selection changed event to update the menus.
-			//
-			if (selectionProvider.getSelection() != null) {
-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
-			}
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
-	 * that can be added to the selected object and updating the menus accordingly.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void selectionChanged(SelectionChangedEvent event) {
-		// Remove any menu items for old selection.
-		//
-		if (createChildMenuManager != null) {
-			depopulateManager(createChildMenuManager, createChildActions);
-		}
-		if (createSiblingMenuManager != null) {
-			depopulateManager(createSiblingMenuManager, createSiblingActions);
-		}
-
-		// Query the new selection for appropriate new child/sibling descriptors
-		//
-		Collection<?> newChildDescriptors = null;
-		Collection<?> newSiblingDescriptors = null;
-
-		ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {
-			Object object = ((IStructuredSelection) selection).getFirstElement();
-
-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();
-
-			newChildDescriptors = domain.getNewChildDescriptors(object, null);
-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
-		}
-
-		// Generate actions for selection; populate and redraw the menus.
-		//
-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
-
-		if (createChildMenuManager != null) {
-			populateManager(createChildMenuManager, createChildActions, null);
-			createChildMenuManager.update(true);
-		}
-		if (createSiblingMenuManager != null) {
-			populateManager(createSiblingMenuManager, createSiblingActions, null);
-			createSiblingMenuManager.update(true);
-		}
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
-	 * by inserting them before the specified contribution item <code>contributionID</code>.
-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
-		if (actions != null) {
-			for (IAction action : actions) {
-				if (contributionID != null) {
-					manager.insertBefore(contributionID, action);
-				}
-				else {
-					manager.add(action);
-				}
-			}
-		}
-	}
-
-	/**
-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
-		if (actions != null) {
-			IContributionItem[] items = manager.getItems();
-			for (int i = 0; i < items.length; i++) {
-				// Look into SubContributionItems
-				//
-				IContributionItem contributionItem = items[i];
-				while (contributionItem instanceof SubContributionItem) {
-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();
-				}
-
-				// Delete the ActionContributionItems with matching action.
-				//
-				if (contributionItem instanceof ActionContributionItem) {
-					IAction action = ((ActionContributionItem) contributionItem).getAction();
-					if (actions.contains(action)) {
-						manager.remove(contributionItem);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This populates the pop-up menu before it appears.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void menuAboutToShow(IMenuManager menuManager) {
-		super.menuAboutToShow(menuManager);
-		MenuManager submenuManager = null;
-
-		submenuManager = new MenuManager(GeneratoroptionsmmEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		populateManager(submenuManager, createChildActions, null);
-		menuManager.insertBefore("edit", submenuManager);
-
-		submenuManager = new MenuManager(GeneratoroptionsmmEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		populateManager(submenuManager, createSiblingActions, null);
-		menuManager.insertBefore("edit", submenuManager);
-	}
-
-	/**
-	 * This inserts global actions before the "additions-end" separator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void addGlobalActions(IMenuManager menuManager) {
-		menuManager.insertAfter("additions-end", new Separator("ui-actions"));
-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);
-
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-		menuManager.insertAfter("ui-actions", refreshViewerAction);
-
-		super.addGlobalActions(menuManager);
-	}
-
-	/**
-	 * This ensures that a delete action will clean up all references to deleted objects.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected boolean removeAllReferencesOnDelete() {
-		return true;
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditor.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditor.java
deleted file mode 100644
index ea67ddb..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditor.java
+++ /dev/null
@@ -1,1889 +0,0 @@
-/**
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.presentation;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.ui.MarkerHelper;
-import org.eclipse.emf.common.ui.ViewerPane;
-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
-import org.eclipse.emf.edit.ui.util.EditUIUtil;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.provider.GeneratoroptionsmmItemProviderAdapterFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheet;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-
-/**
- * This is an example of a Generatoroptionsmm model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class GeneratoroptionsmmEditor
-		extends MultiPageEditorPart
-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
-	/**
-	 * This keeps track of the editing domain that is used to track all changes to the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected AdapterFactoryEditingDomain editingDomain;
-
-	/**
-	 * This is the one adapter factory used for providing views of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ComposedAdapterFactory adapterFactory;
-
-	/**
-	 * This is the content outline page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IContentOutlinePage contentOutlinePage;
-
-	/**
-	 * This is a kludge...
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IStatusLineManager contentOutlineStatusLineManager;
-
-	/**
-	 * This is the content outline page's viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer contentOutlineViewer;
-
-	/**
-	 * This is the property sheet page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
-
-	/**
-	 * This is the viewer that shadows the selection in the content outline.
-	 * The parent relation must be correctly defined for this to work.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer selectionViewer;
-
-	/**
-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer parentViewer;
-
-	/**
-	 * This shows how a tree view works.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer treeViewer;
-
-	/**
-	 * This shows how a list view works.
-	 * A list viewer doesn't support icons.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ListViewer listViewer;
-
-	/**
-	 * This shows how a table view works.
-	 * A table can be used as a list with icons.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TableViewer tableViewer;
-
-	/**
-	 * This shows how a tree view with columns works.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer treeViewerWithColumns;
-
-	/**
-	 * This keeps track of the active viewer pane, in the book.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ViewerPane currentViewerPane;
-
-	/**
-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Viewer currentViewer;
-
-	/**
-	 * This listens to which ever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ISelectionChangedListener selectionChangedListener;
-
-	/**
-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
-
-	/**
-	 * This keeps track of the selection of the editor as a whole.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ISelection editorSelection = StructuredSelection.EMPTY;
-
-	/**
-	 * The MarkerHelper is responsible for creating workspace resource markers presented
-	 * in Eclipse's Problems View.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
-
-	/**
-	 * This listens for when the outline becomes active
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IPartListener partListener =
-			new IPartListener() {
-				@Override
-				public void partActivated(IWorkbenchPart p) {
-					if (p instanceof ContentOutline) {
-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
-							getActionBarContributor().setActiveEditor(GeneratoroptionsmmEditor.this);
-
-							setCurrentViewer(contentOutlineViewer);
-						}
-					}
-					else if (p instanceof PropertySheet) {
-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {
-							getActionBarContributor().setActiveEditor(GeneratoroptionsmmEditor.this);
-							handleActivate();
-						}
-					}
-					else if (p == GeneratoroptionsmmEditor.this) {
-						handleActivate();
-					}
-				}
-
-				@Override
-				public void partBroughtToTop(IWorkbenchPart p) {
-					// Ignore.
-				}
-
-				@Override
-				public void partClosed(IWorkbenchPart p) {
-					// Ignore.
-				}
-
-				@Override
-				public void partDeactivated(IWorkbenchPart p) {
-					// Ignore.
-				}
-
-				@Override
-				public void partOpened(IWorkbenchPart p) {
-					// Ignore.
-				}
-			};
-
-	/**
-	 * Resources that have been removed since last activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been changed since last activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been saved.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Resource> savedResources = new ArrayList<Resource>();
-
-	/**
-	 * Map to store the diagnostic associated with a resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
-
-	/**
-	 * Controls whether the problem indication should be updated.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean updateProblemIndication = true;
-
-	/**
-	 * Adapter used to update the problem indication when resources are demanded loaded.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected EContentAdapter problemIndicationAdapter =
-			new EContentAdapter() {
-				@Override
-				public void notifyChanged(Notification notification) {
-					if (notification.getNotifier() instanceof Resource) {
-						switch (notification.getFeatureID(Resource.class)) {
-						case Resource.RESOURCE__IS_LOADED:
-						case Resource.RESOURCE__ERRORS:
-						case Resource.RESOURCE__WARNINGS: {
-							Resource resource = (Resource) notification.getNotifier();
-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
-							if (diagnostic.getSeverity() != Diagnostic.OK) {
-								resourceToDiagnosticMap.put(resource, diagnostic);
-							}
-							else {
-								resourceToDiagnosticMap.remove(resource);
-							}
-
-							if (updateProblemIndication) {
-								getSite().getShell().getDisplay().asyncExec
-										(new Runnable() {
-											@Override
-											public void run() {
-												updateProblemIndication();
-											}
-										});
-							}
-							break;
-						}
-						}
-					}
-					else {
-						super.notifyChanged(notification);
-					}
-				}
-
-				@Override
-				protected void setTarget(Resource target) {
-					basicSetTarget(target);
-				}
-
-				@Override
-				protected void unsetTarget(Resource target) {
-					basicUnsetTarget(target);
-					resourceToDiagnosticMap.remove(target);
-					if (updateProblemIndication) {
-						getSite().getShell().getDisplay().asyncExec
-								(new Runnable() {
-									@Override
-									public void run() {
-										updateProblemIndication();
-									}
-								});
-					}
-				}
-			};
-
-	/**
-	 * This listens for workspace changes.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IResourceChangeListener resourceChangeListener =
-			new IResourceChangeListener() {
-				@Override
-				public void resourceChanged(IResourceChangeEvent event) {
-					IResourceDelta delta = event.getDelta();
-					try {
-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-							protected ResourceSet resourceSet = editingDomain.getResourceSet();
-							protected Collection<Resource> changedResources = new ArrayList<Resource>();
-							protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-							@Override
-							public boolean visit(IResourceDelta delta) {
-								if (delta.getResource().getType() == IResource.FILE) {
-									if (delta.getKind() == IResourceDelta.REMOVED ||
-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
-										if (resource != null) {
-											if (delta.getKind() == IResourceDelta.REMOVED) {
-												removedResources.add(resource);
-											}
-											else if (!savedResources.remove(resource)) {
-												changedResources.add(resource);
-											}
-										}
-									}
-									return false;
-								}
-
-								return true;
-							}
-
-							public Collection<Resource> getChangedResources() {
-								return changedResources;
-							}
-
-							public Collection<Resource> getRemovedResources() {
-								return removedResources;
-							}
-						}
-
-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-						delta.accept(visitor);
-
-						if (!visitor.getRemovedResources().isEmpty()) {
-							getSite().getShell().getDisplay().asyncExec
-									(new Runnable() {
-										@Override
-										public void run() {
-											removedResources.addAll(visitor.getRemovedResources());
-											if (!isDirty()) {
-												getSite().getPage().closeEditor(GeneratoroptionsmmEditor.this, false);
-											}
-										}
-									});
-						}
-
-						if (!visitor.getChangedResources().isEmpty()) {
-							getSite().getShell().getDisplay().asyncExec
-									(new Runnable() {
-										@Override
-										public void run() {
-											changedResources.addAll(visitor.getChangedResources());
-											if (getSite().getPage().getActiveEditor() == GeneratoroptionsmmEditor.this) {
-												handleActivate();
-											}
-										}
-									});
-						}
-					}
-					catch (CoreException exception) {
-						GeneratoroptionsmmEditorPlugin.INSTANCE.log(exception);
-					}
-				}
-			};
-
-	/**
-	 * Handles activation of the editor or it's associated views.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void handleActivate() {
-		// Recompute the read only state.
-		//
-		if (editingDomain.getResourceToReadOnlyMap() != null) {
-			editingDomain.getResourceToReadOnlyMap().clear();
-
-			// Refresh any actions that may become enabled or disabled.
-			//
-			setSelection(getSelection());
-		}
-
-		if (!removedResources.isEmpty()) {
-			if (handleDirtyConflict()) {
-				getSite().getPage().closeEditor(GeneratoroptionsmmEditor.this, false);
-			}
-			else {
-				removedResources.clear();
-				changedResources.clear();
-				savedResources.clear();
-			}
-		}
-		else if (!changedResources.isEmpty()) {
-			changedResources.removeAll(savedResources);
-			handleChangedResources();
-			changedResources.clear();
-			savedResources.clear();
-		}
-	}
-
-	/**
-	 * Handles what to do with changed resources on activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void handleChangedResources() {
-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
-			if (isDirty()) {
-				changedResources.addAll(editingDomain.getResourceSet().getResources());
-			}
-			editingDomain.getCommandStack().flush();
-
-			updateProblemIndication = false;
-			for (Resource resource : changedResources) {
-				if (resource.isLoaded()) {
-					resource.unload();
-					try {
-						resource.load(Collections.EMPTY_MAP);
-					} catch (IOException exception) {
-						if (!resourceToDiagnosticMap.containsKey(resource)) {
-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-						}
-					}
-				}
-			}
-
-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
-				setSelection(StructuredSelection.EMPTY);
-			}
-
-			updateProblemIndication = true;
-			updateProblemIndication();
-		}
-	}
-
-	/**
-	 * Updates the problems indication with the information described in the specified diagnostic.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void updateProblemIndication() {
-		if (updateProblemIndication) {
-			BasicDiagnostic diagnostic =
-					new BasicDiagnostic
-					(Diagnostic.OK,
-							"org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor",
-							0,
-							null,
-							new Object[] { editingDomain.getResourceSet() });
-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
-					diagnostic.add(childDiagnostic);
-				}
-			}
-
-			int lastEditorPage = getPageCount() - 1;
-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					setActivePage(lastEditorPage);
-				}
-			}
-			else if (diagnostic.getSeverity() != Diagnostic.OK) {
-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
-				problemEditorPart.setDiagnostic(diagnostic);
-				problemEditorPart.setMarkerHelper(markerHelper);
-				try {
-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
-					setPageText(lastEditorPage, problemEditorPart.getPartName());
-					setActivePage(lastEditorPage);
-					showTabs();
-				} catch (PartInitException exception) {
-					GeneratoroptionsmmEditorPlugin.INSTANCE.log(exception);
-				}
-			}
-
-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
-				markerHelper.deleteMarkers(editingDomain.getResourceSet());
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					try {
-						markerHelper.createMarkers(diagnostic);
-					} catch (CoreException exception) {
-						GeneratoroptionsmmEditorPlugin.INSTANCE.log(exception);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Shows a dialog that asks if conflicting changes should be discarded.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean handleDirtyConflict() {
-		return MessageDialog.openQuestion
-				(getSite().getShell(),
-						getString("_UI_FileConflict_label"),
-						getString("_WARN_FileConflict"));
-	}
-
-	/**
-	 * This creates a model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public GeneratoroptionsmmEditor() {
-		super();
-		initializeEditingDomain();
-	}
-
-	/**
-	 * This sets up the editing domain for the model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void initializeEditingDomain() {
-		// Create an adapter factory that yields item providers.
-		//
-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new GeneratoroptionsmmItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-
-		// Create the command stack that will notify this editor as commands are executed.
-		//
-		BasicCommandStack commandStack = new BasicCommandStack();
-
-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
-		//
-		commandStack.addCommandStackListener
-				(new CommandStackListener() {
-					@Override
-					public void commandStackChanged(final EventObject event) {
-						getContainer().getDisplay().asyncExec
-								(new Runnable() {
-									@Override
-									public void run() {
-										firePropertyChange(IEditorPart.PROP_DIRTY);
-
-										// Try to select the affected objects.
-										//
-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();
-										if (mostRecentCommand != null) {
-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());
-										}
-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {
-											PropertySheetPage propertySheetPage = i.next();
-											if (propertySheetPage.getControl().isDisposed()) {
-												i.remove();
-											}
-											else {
-												propertySheetPage.refresh();
-											}
-										}
-									}
-								});
-					}
-				});
-
-		// Create the editing domain with a special command stack.
-		//
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
-	}
-
-	/**
-	 * This is here for the listener to be able to call it.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void firePropertyChange(int action) {
-		super.firePropertyChange(action);
-	}
-
-	/**
-	 * This sets the selection into whichever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setSelectionToViewer(Collection<?> collection) {
-		final Collection<?> theSelection = collection;
-		// Make sure it's okay.
-		//
-		if (theSelection != null && !theSelection.isEmpty()) {
-			Runnable runnable =
-					new Runnable() {
-						@Override
-						public void run() {
-							// Try to select the items in the current content viewer of the editor.
-							//
-							if (currentViewer != null) {
-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
-							}
-						}
-					};
-			getSite().getShell().getDisplay().asyncExec(runnable);
-		}
-	}
-
-	/**
-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
-			super(adapterFactory);
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public Object[] getElements(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public Object[] getChildren(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public boolean hasChildren(Object object) {
-			Object parent = super.getParent(object);
-			return parent != null;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public Object getParent(Object object) {
-			return null;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setCurrentViewerPane(ViewerPane viewerPane) {
-		if (currentViewerPane != viewerPane) {
-			if (currentViewerPane != null) {
-				currentViewerPane.showFocus(false);
-			}
-			currentViewerPane = viewerPane;
-		}
-		setCurrentViewer(currentViewerPane.getViewer());
-	}
-
-	/**
-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
-	 * is the current one.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setCurrentViewer(Viewer viewer) {
-		// If it is changing...
-		//
-		if (currentViewer != viewer) {
-			if (selectionChangedListener == null) {
-				// Create the listener on demand.
-				//
-				selectionChangedListener =
-						new ISelectionChangedListener() {
-							// This just notifies those things that are affected by the section.
-							//
-							@Override
-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
-								setSelection(selectionChangedEvent.getSelection());
-							}
-						};
-			}
-
-			// Stop listening to the old one.
-			//
-			if (currentViewer != null) {
-				currentViewer.removeSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Start listening to the new one.
-			//
-			if (viewer != null) {
-				viewer.addSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Remember it.
-			//
-			currentViewer = viewer;
-
-			// Set the editors selection based on the current viewer's selection.
-			//
-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
-		}
-	}
-
-	/**
-	 * This returns the viewer as required by the {@link IViewerProvider} interface.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Viewer getViewer() {
-		return currentViewer;
-	}
-
-	/**
-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void createContextMenuFor(StructuredViewer viewer) {
-		MenuManager contextMenu = new MenuManager("#PopUp");
-		contextMenu.add(new Separator("additions"));
-		contextMenu.setRemoveAllWhenShown(true);
-		contextMenu.addMenuListener(this);
-		Menu menu = contextMenu.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
-
-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
-	}
-
-	/**
-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void createModel() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
-		Exception exception = null;
-		Resource resource = null;
-		try {
-			// Load the resource through the editing domain.
-			//
-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
-		} catch (Exception e) {
-			exception = e;
-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
-		}
-
-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-		if (diagnostic.getSeverity() != Diagnostic.OK) {
-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-		}
-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
-	}
-
-	/**
-	 * Returns a diagnostic describing the errors and warnings listed in the resource
-	 * and the specified exception (if any).
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
-			BasicDiagnostic basicDiagnostic =
-					new BasicDiagnostic
-					(Diagnostic.ERROR,
-							"org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor",
-							0,
-							getString("_UI_CreateModelError_message", resource.getURI()),
-							new Object[] { exception == null ? (Object) resource : exception });
-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
-			return basicDiagnostic;
-		}
-		else if (exception != null) {
-			return new BasicDiagnostic(Diagnostic.ERROR,
-					"org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor",
-					0,
-					getString("_UI_CreateModelError_message", resource.getURI()),
-					new Object[] { exception });
-		}
-		else {
-			return Diagnostic.OK_INSTANCE;
-		}
-	}
-
-	/**
-	 * This is the method used by the framework to install your own controls.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void createPages() {
-		// Creates the model from the editor input
-		//
-		createModel();
-
-		// Only creates the other pages if there is something that can be edited
-		//
-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
-			// Create a page for the selection tree view.
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), GeneratoroptionsmmEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								Tree tree = new Tree(composite, SWT.MULTI);
-								TreeViewer newTreeViewer = new TreeViewer(tree);
-								return newTreeViewer;
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-
-				selectionViewer = (TreeViewer) viewerPane.getViewer();
-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-
-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				selectionViewer.setInput(editingDomain.getResourceSet());
-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-				viewerPane.setTitle(editingDomain.getResourceSet());
-
-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
-
-				createContextMenuFor(selectionViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_SelectionPage_label"));
-			}
-
-			// Create a page for the parent tree view.
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), GeneratoroptionsmmEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								Tree tree = new Tree(composite, SWT.MULTI);
-								TreeViewer newTreeViewer = new TreeViewer(tree);
-								return newTreeViewer;
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-
-				parentViewer = (TreeViewer) viewerPane.getViewer();
-				parentViewer.setAutoExpandLevel(30);
-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(parentViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_ParentPage_label"));
-			}
-
-			// This is the page for the list viewer
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), GeneratoroptionsmmEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								return new ListViewer(composite);
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-				listViewer = (ListViewer) viewerPane.getViewer();
-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(listViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_ListPage_label"));
-			}
-
-			// This is the page for the tree viewer
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), GeneratoroptionsmmEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								return new TreeViewer(composite);
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-				treeViewer = (TreeViewer) viewerPane.getViewer();
-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
-
-				createContextMenuFor(treeViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TreePage_label"));
-			}
-
-			// This is the page for the table viewer.
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), GeneratoroptionsmmEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								return new TableViewer(composite);
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-				tableViewer = (TableViewer) viewerPane.getViewer();
-
-				Table table = tableViewer.getTable();
-				TableLayout layout = new TableLayout();
-				table.setLayout(layout);
-				table.setHeaderVisible(true);
-				table.setLinesVisible(true);
-
-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
-				layout.addColumnData(new ColumnWeightData(3, 100, true));
-				objectColumn.setText(getString("_UI_ObjectColumn_label"));
-				objectColumn.setResizable(true);
-
-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
-				layout.addColumnData(new ColumnWeightData(2, 100, true));
-				selfColumn.setText(getString("_UI_SelfColumn_label"));
-				selfColumn.setResizable(true);
-
-				tableViewer.setColumnProperties(new String[] { "a", "b" });
-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(tableViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TablePage_label"));
-			}
-
-			// This is the page for the table tree viewer.
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), GeneratoroptionsmmEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								return new TreeViewer(composite);
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-
-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();
-
-				Tree tree = treeViewerWithColumns.getTree();
-				tree.setLayoutData(new FillLayout());
-				tree.setHeaderVisible(true);
-				tree.setLinesVisible(true);
-
-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
-				objectColumn.setText(getString("_UI_ObjectColumn_label"));
-				objectColumn.setResizable(true);
-				objectColumn.setWidth(250);
-
-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
-				selfColumn.setText(getString("_UI_SelfColumn_label"));
-				selfColumn.setResizable(true);
-				selfColumn.setWidth(200);
-
-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" });
-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(treeViewerWithColumns);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));
-			}
-
-			getSite().getShell().getDisplay().asyncExec
-					(new Runnable() {
-						@Override
-						public void run() {
-							setActivePage(0);
-						}
-					});
-		}
-
-		// Ensures that this editor will only display the page's tab
-		// area if there are more than one page
-		//
-		getContainer().addControlListener
-				(new ControlAdapter() {
-					boolean guard = false;
-
-					@Override
-					public void controlResized(ControlEvent event) {
-						if (!guard) {
-							guard = true;
-							hideTabs();
-							guard = false;
-						}
-					}
-				});
-
-		getSite().getShell().getDisplay().asyncExec
-				(new Runnable() {
-					@Override
-					public void run() {
-						updateProblemIndication();
-					}
-				});
-	}
-
-	/**
-	 * If there is just one page in the multi-page editor part,
-	 * this hides the single tab at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void hideTabs() {
-		if (getPageCount() <= 1) {
-			setPageText(0, "");
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder) getContainer()).setTabHeight(1);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y + 6);
-			}
-		}
-	}
-
-	/**
-	 * If there is more than one page in the multi-page editor part,
-	 * this shows the tabs at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void showTabs() {
-		if (getPageCount() > 1) {
-			setPageText(0, getString("_UI_SelectionPage_label"));
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y - 6);
-			}
-		}
-	}
-
-	/**
-	 * This is used to track the active viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void pageChange(int pageIndex) {
-		super.pageChange(pageIndex);
-
-		if (contentOutlinePage != null) {
-			handleContentOutlineSelection(contentOutlinePage.getSelection());
-		}
-	}
-
-	/**
-	 * This is how the framework determines which interfaces we implement.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("rawtypes")
-	@Override
-	public Object getAdapter(Class key) {
-		if (key.equals(IContentOutlinePage.class)) {
-			return showOutlineView() ? getContentOutlinePage() : null;
-		}
-		else if (key.equals(IPropertySheetPage.class)) {
-			return getPropertySheetPage();
-		}
-		else if (key.equals(IGotoMarker.class)) {
-			return this;
-		}
-		else {
-			return super.getAdapter(key);
-		}
-	}
-
-	/**
-	 * This accesses a cached version of the content outliner.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IContentOutlinePage getContentOutlinePage() {
-		if (contentOutlinePage == null) {
-			// The content outline is just a tree.
-			//
-			class MyContentOutlinePage extends ContentOutlinePage {
-				@Override
-				public void createControl(Composite parent) {
-					super.createControl(parent);
-					contentOutlineViewer = getTreeViewer();
-					contentOutlineViewer.addSelectionChangedListener(this);
-
-					// Set up the tree viewer.
-					//
-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-					contentOutlineViewer.setInput(editingDomain.getResourceSet());
-
-					// Make sure our popups work.
-					//
-					createContextMenuFor(contentOutlineViewer);
-
-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
-						// Select the root object in the view.
-						//
-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-					}
-				}
-
-				@Override
-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
-					super.makeContributions(menuManager, toolBarManager, statusLineManager);
-					contentOutlineStatusLineManager = statusLineManager;
-				}
-
-				@Override
-				public void setActionBars(IActionBars actionBars) {
-					super.setActionBars(actionBars);
-					getActionBarContributor().shareGlobalActions(this, actionBars);
-				}
-			}
-
-			contentOutlinePage = new MyContentOutlinePage();
-
-			// Listen to selection so that we can handle it is a special way.
-			//
-			contentOutlinePage.addSelectionChangedListener
-					(new ISelectionChangedListener() {
-						// This ensures that we handle selections correctly.
-						//
-						@Override
-						public void selectionChanged(SelectionChangedEvent event) {
-							handleContentOutlineSelection(event.getSelection());
-						}
-					});
-		}
-
-		return contentOutlinePage;
-	}
-
-	/**
-	 * This accesses a cached version of the property sheet.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IPropertySheetPage getPropertySheetPage() {
-		PropertySheetPage propertySheetPage =
-				new ExtendedPropertySheetPage(editingDomain) {
-					@Override
-					public void setSelectionToViewer(List<?> selection) {
-						GeneratoroptionsmmEditor.this.setSelectionToViewer(selection);
-						GeneratoroptionsmmEditor.this.setFocus();
-					}
-
-					@Override
-					public void setActionBars(IActionBars actionBars) {
-						super.setActionBars(actionBars);
-						getActionBarContributor().shareGlobalActions(this, actionBars);
-					}
-				};
-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
-		propertySheetPages.add(propertySheetPage);
-
-		return propertySheetPage;
-	}
-
-	/**
-	 * This deals with how we want selection in the outliner to affect the other views.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void handleContentOutlineSelection(ISelection selection) {
-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();
-			if (selectedElements.hasNext()) {
-				// Get the first selected element.
-				//
-				Object selectedElement = selectedElements.next();
-
-				// If it's the selection viewer, then we want it to select the same selection as this selection.
-				//
-				if (currentViewerPane.getViewer() == selectionViewer) {
-					ArrayList<Object> selectionList = new ArrayList<Object>();
-					selectionList.add(selectedElement);
-					while (selectedElements.hasNext()) {
-						selectionList.add(selectedElements.next());
-					}
-
-					// Set the selection to the widget.
-					//
-					selectionViewer.setSelection(new StructuredSelection(selectionList));
-				}
-				else {
-					// Set the input to the widget.
-					//
-					if (currentViewerPane.getViewer().getInput() != selectedElement) {
-						currentViewerPane.getViewer().setInput(selectedElement);
-						currentViewerPane.setTitle(selectedElement);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isDirty() {
-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply saves the model file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void doSave(IProgressMonitor progressMonitor) {
-		// Save only resources that have actually changed.
-		//
-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
-
-		// Do the work within an operation because this is a long running activity that modifies the workbench.
-		//
-		WorkspaceModifyOperation operation =
-				new WorkspaceModifyOperation() {
-					// This is the method that gets invoked when the operation runs.
-					//
-					@Override
-					public void execute(IProgressMonitor monitor) {
-						// Save the resources to the file system.
-						//
-						boolean first = true;
-						for (Resource resource : editingDomain.getResourceSet().getResources()) {
-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
-								try {
-									long timeStamp = resource.getTimeStamp();
-									resource.save(saveOptions);
-									if (resource.getTimeStamp() != timeStamp) {
-										savedResources.add(resource);
-									}
-								}
-								catch (Exception exception) {
-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-								}
-								first = false;
-							}
-						}
-					}
-				};
-
-		updateProblemIndication = false;
-		try {
-			// This runs the options, and shows progress.
-			//
-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
-
-			// Refresh the necessary state.
-			//
-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();
-			firePropertyChange(IEditorPart.PROP_DIRTY);
-		} catch (Exception exception) {
-			// Something went wrong that shouldn't.
-			//
-			GeneratoroptionsmmEditorPlugin.INSTANCE.log(exception);
-		}
-		updateProblemIndication = true;
-		updateProblemIndication();
-	}
-
-	/**
-	 * This returns whether something has been persisted to the URI of the specified resource.
-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean isPersisted(Resource resource) {
-		boolean result = false;
-		try {
-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
-			if (stream != null) {
-				result = true;
-				stream.close();
-			}
-		} catch (IOException e) {
-			// Ignore
-		}
-		return result;
-	}
-
-	/**
-	 * This always returns true because it is not currently supported.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * This also changes the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void doSaveAs() {
-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
-		saveAsDialog.open();
-		IPath path = saveAsDialog.getResult();
-		if (path != null) {
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			if (file != null) {
-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
-			}
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void doSaveAs(URI uri, IEditorInput editorInput) {
-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		IProgressMonitor progressMonitor =
-				getActionBars().getStatusLineManager() != null ?
-						getActionBars().getStatusLineManager().getProgressMonitor() :
-						new NullProgressMonitor();
-		doSave(progressMonitor);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void gotoMarker(IMarker marker) {
-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
-		if (!targetObjects.isEmpty()) {
-			setSelectionToViewer(targetObjects);
-		}
-	}
-
-	/**
-	 * This is called during startup.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput editorInput) {
-		setSite(site);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		site.setSelectionProvider(this);
-		site.getPage().addPartListener(partListener);
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setFocus() {
-		if (currentViewerPane != null) {
-			currentViewerPane.setFocus();
-		}
-		else {
-			getControl(getActivePage()).setFocus();
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.add(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ISelection getSelection() {
-		return editorSelection;
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
-	 * Calling this result will notify the listeners.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setSelection(ISelection selection) {
-		editorSelection = selection;
-
-		for (ISelectionChangedListener listener : selectionChangedListeners) {
-			listener.selectionChanged(new SelectionChangedEvent(this, selection));
-		}
-		setStatusLineManager(selection);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setStatusLineManager(ISelection selection) {
-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
-
-		if (statusLineManager != null) {
-			if (selection instanceof IStructuredSelection) {
-				Collection<?> collection = ((IStructuredSelection) selection).toList();
-				switch (collection.size()) {
-				case 0: {
-					statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
-					break;
-				}
-				case 1: {
-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
-					break;
-				}
-				default: {
-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
-					break;
-				}
-				}
-			}
-			else {
-				statusLineManager.setMessage("");
-			}
-		}
-	}
-
-	/**
-	 * This looks up a string in the plugin's plugin.properties file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static String getString(String key) {
-		return GeneratoroptionsmmEditorPlugin.INSTANCE.getString(key);
-	}
-
-	/**
-	 * This looks up a string in plugin.properties, making a substitution.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static String getString(String key, Object s1) {
-		return GeneratoroptionsmmEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void menuAboutToShow(IMenuManager menuManager) {
-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EditingDomainActionBarContributor getActionBarContributor() {
-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IActionBars getActionBars() {
-		return getActionBarContributor().getActionBars();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public AdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		updateProblemIndication = false;
-
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
-
-		getSite().getPage().removePartListener(partListener);
-
-		adapterFactory.dispose();
-
-		if (getActionBarContributor().getActiveEditor() == this) {
-			getActionBarContributor().setActiveEditor(null);
-		}
-
-		for (PropertySheetPage propertySheetPage : propertySheetPages) {
-			propertySheetPage.dispose();
-		}
-
-		if (contentOutlinePage != null) {
-			contentOutlinePage.dispose();
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * Returns whether the outline view should be presented to the user.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean showOutlineView() {
-		return true;
-	}
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditorPlugin.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditorPlugin.java
deleted file mode 100644
index 2af3227..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmEditorPlugin.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.presentation;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.ui.EclipseUIPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Generatoroptionsmm editor plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public final class GeneratoroptionsmmEditorPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final GeneratoroptionsmmEditorPlugin INSTANCE = new GeneratoroptionsmmEditorPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public GeneratoroptionsmmEditorPlugin() {
-		super(new ResourceLocator[] {
-				});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static class Implementation extends EclipseUIPlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmModelWizard.java b/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmModelWizard.java
deleted file mode 100644
index a44209c..0000000
--- a/languages/java/org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.editor/src/org/eclipse/papyrus/designer/languages/java/generator/metamodel/jdt/generatoroptionsmm/presentation/GeneratoroptionsmmModelWizard.java
+++ /dev/null
@@ -1,641 +0,0 @@
-/**
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-package org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.presentation;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.GeneratoroptionsmmFactory;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.GeneratoroptionsmmPackage;
-import org.eclipse.papyrus.designer.languages.java.generator.metamodel.jdt.generatoroptionsmm.provider.GeneratoroptionsmmEditPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-
-/**
- * This is a simple wizard for creating a new model file.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class GeneratoroptionsmmModelWizard extends Wizard implements INewWizard {
-	/**
-	 * The supported extensions for created files.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final List<String> FILE_EXTENSIONS =
-			Collections.unmodifiableList(Arrays.asList(GeneratoroptionsmmEditorPlugin.INSTANCE.getString("_UI_GeneratoroptionsmmEditorFilenameExtensions").split("\\s*,\\s*")));
-
-	/**
-	 * A formatted list of supported file extensions, suitable for display.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final String FORMATTED_FILE_EXTENSIONS =
-			GeneratoroptionsmmEditorPlugin.INSTANCE.getString("_UI_GeneratoroptionsmmEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
-
-	/**
-	 * This caches an instance of the model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected GeneratoroptionsmmPackage generatoroptionsmmPackage = GeneratoroptionsmmPackage.eINSTANCE;
-
-	/**
-	 * This caches an instance of the model factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected GeneratoroptionsmmFactory generatoroptionsmmFactory = generatoroptionsmmPackage.getGeneratoroptionsmmFactory();
-
-	/**
-	 * This is the file creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected GeneratoroptionsmmModelWizardNewFileCreationPage newFileCreationPage;
-
-	/**
-	 * This is the initial object creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected GeneratoroptionsmmModelWizardInitialObjectCreationPage initialObjectCreationPage;
-
-	/**
-	 * Remember the selection during initialization for populating the default container.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IStructuredSelection selection;
-
-	/**
-	 * Remember the workbench during initialization.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IWorkbench workbench;
-
-	/**
-	 * Caches the names of the types that can be created as the root object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected List<String> initialObjectNames;
-
-	/**
-	 * This just records the information.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.se