Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2017-03-03 13:25:46 +0000
committerBenoit Maggi2017-03-06 09:28:55 +0000
commitdae1975a750504c70f07a5f25a733e490ecc4982 (patch)
tree385e1ba07e93b25c964d0e6b79c9f611b4d5e7ef /extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text
parent0513af69e311b92326fad7cb236e3f323f7af7ba (diff)
downloadorg.eclipse.papyrus-dae1975a750504c70f07a5f25a733e490ecc4982.tar.gz
org.eclipse.papyrus-dae1975a750504c70f07a5f25a733e490ecc4982.tar.xz
org.eclipse.papyrus-dae1975a750504c70f07a5f25a733e490ecc4982.zip
Bug 512983 - [ALF Extra] Move the extra part to incubation
- remove code related to alf extra - the code has been moved to org.eclipse.papyrus.incubation Change-Id: If81f3a3ba3ca0ac2d81cb3be7ca5a0a93aa0d09d Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
Diffstat (limited to 'extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text')
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.classpath7
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.project28
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.core.prefs291
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.ui.prefs68
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/META-INF/MANIFEST.MF23
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/about.html28
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/build.properties6
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/pom.xml14
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/ActivatorText.java67
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/DefaultEditStringRetrievalStrategy.java121
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/EditStringRetrievalStrategy.java47
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/AlfCompareEditor.java46
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/MergeActionDialog.java137
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java187
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/IAlfTextualRepresentation.java31
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/TextualRepresentation.java98
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/IAdvancedDifference.java41
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineComparator.java53
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineDifference.java102
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/RegionDifference.java77
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/StringUtil.java44
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/TokenDifference.java62
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParser.java98
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParsingError.java25
24 files changed, 0 insertions, 1701 deletions
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.classpath b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.classpath
deleted file mode 100644
index b1dabee3829..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.project b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.project
deleted file mode 100644
index 116c74ef06e..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.uml.alf.text</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.core.prefs b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9ca8e68231b..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/META-INF/MANIFEST.MF b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/META-INF/MANIFEST.MF
deleted file mode 100644
index 5387153d4c8..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.uml.alf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.alf.libraries;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.compare,
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.swt,
- org.eclipse.compare.core,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.alf.text.generation,
- org.eclipse.papyrus.uml.alf.text.merge.manual,
- org.eclipse.papyrus.uml.alf.text.representation,
- org.eclipse.papyrus.uml.alf.text.representation.util
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 0.7.0.qualifier
-Bundle-Name: ALF Text (Incubation)
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.alf.text.ActivatorText
-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.text
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/about.html b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/about.html
deleted file mode 100644
index 209103075a7..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/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>November 14, 2008</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> \ No newline at end of file
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/build.properties b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/build.properties
deleted file mode 100644
index 785a40c0ec7..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html
-src.includes = about.html
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/pom.xml b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/pom.xml
deleted file mode 100644
index 2d038ab45fd..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.eclipse.papyrus.extra.releng</artifactId>
- <groupId>org.eclipse.papyrus</groupId>
- <version>3.0.0-SNAPSHOT</version>
- <relativePath>../../../../releng/extra</relativePath>
- </parent>
- <artifactId>org.eclipse.papyrus.uml.alf.text</artifactId>
- <groupId>org.eclipse.papyrus</groupId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project> \ No newline at end of file
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/ActivatorText.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/ActivatorText.java
deleted file mode 100644
index c9089ee5ab1..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/ActivatorText.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.papyrus.uml.alf.text;
-
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.papyrus.uml.alf.AlfRuntimeModule;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class ActivatorText extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.alf.text"; //$NON-NLS-1$
-
- // The shared instance
- private static ActivatorText plugin;
-
- private Injector injector;
-
- public static LogHelper logger;
-
- /**
- * The constructor
- */
- public ActivatorText() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- this.injector = Guice.createInjector(new AlfRuntimeModule());
- logger = new LogHelper(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- logger = null;
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static ActivatorText getDefault() {
- return plugin;
- }
-
- public Injector getInjector() {
- return this.injector;
- }
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/DefaultEditStringRetrievalStrategy.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/DefaultEditStringRetrievalStrategy.java
deleted file mode 100644
index 85ad34e43bb..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/DefaultEditStringRetrievalStrategy.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.eclipse.papyrus.uml.alf.text.generation;
-
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet (CEA LIST);
- *****************************************************************************/
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.uml.alf.Member;
-import org.eclipse.papyrus.uml.alf.PropertyDefinition;
-import org.eclipse.papyrus.uml.alf.text.ActivatorText;
-import org.eclipse.papyrus.uml.alf.text.representation.AlfTextualRepresentation;
-import org.eclipse.papyrus.uml.alf.text.representation.util.RepresentationParser;
-import org.eclipse.papyrus.uml.alf.text.representation.util.RepresentationParsingError;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.xtext.resource.SaveOptions;
-import org.eclipse.xtext.serializer.ISerializer;
-
-public class DefaultEditStringRetrievalStrategy extends EditStringRetrievalStrategy {
-
- /**
- * The serializer associated to the ALF grammar
- */
- private ISerializer serializer;
-
- public DefaultEditStringRetrievalStrategy() {
- this.serializer = ActivatorText.getDefault().getInjector().getInstance(ISerializer.class);
- }
-
- /**
- * Return the textual representation associated to a given model element
- *
- * @param element
- * - the element for which the textual representation is computed
- * @return generated - the textual representation computed for this element
- */
- public String getGeneratedEditString(Element element) {
- String generated = "";
- Resource alfModel = this.getAlfModel((NamedElement) element);
- if (this.serializer != null) {
- EObject serializationTarget = null;
- if (element instanceof Property) {
- serializationTarget = this.getPropertyDefinition((Property) element, alfModel);
- } else {
- serializationTarget = alfModel.getContents().get(0);
- }
- generated = this.serializer.serialize(serializationTarget, SaveOptions.newBuilder().noValidation().getOptions());
- }
- return generated;
- }
-
- /**
- * When opened the editor retrieve the based string on which the user is going to work.
- * There are two possibilities:
- * 1 - The element already has a textual representation associated. Then the return string is the registered representation
- * 2 - The element does not have an associated textual representation. Then the return string is the one dynamically calculated
- *
- * @param element
- * - the element for which the textual representation is computed
- * @return registered - the textual representation computed for this element
- */
- public String getEditString(Element element) {
- AlfTextualRepresentation registeredRep = null;
- /* 1. Parse the representation associated to model element */
- try {
- registeredRep = RepresentationParser.getInstance().
- parse((NamedElement) element);
- } catch (RepresentationParsingError e) {
- e.printStackTrace();
- }
- /* 2. If the representation is in detached state (i.e. there is no model element owning it) then rely on the issued from a snapshot */
- if (registeredRep != null && registeredRep.isDetached()) {
- AlfTextualRepresentation generatedRep = null;
- try {
- generatedRep = RepresentationParser.getInstance().
- getSnapshot((NamedElement) element);
- } catch (RepresentationParsingError e) {
- e.printStackTrace();
- }
- if (generatedRep != null) {
- registeredRep.setText(generatedRep.getContent());
- }
- }
- return registeredRep.getContent();
- }
-
-
- private EObject getPropertyDefinition(Property property, Resource alfModelResource) {
- EObject memberDefinition = null;
- Iterator<EObject> contentIterator = alfModelResource.getAllContents();
- boolean found = false;
- while (contentIterator.hasNext() && !found) {
- EObject currentObject = contentIterator.next();
- if (currentObject instanceof Member) {
- Member member = (Member) currentObject;
- if (member.getVisibility().equals(property.getVisibility().toString())
- && member.getDefinition() instanceof PropertyDefinition) {
- PropertyDefinition definition = (PropertyDefinition) member.getDefinition();
- if (definition.getName().equals(property.getName())) {
- found = (definition.getTypePart().isIsAny() && property.getType() == null)
- || definition.getTypePart().getTypeName().toString().equals(property.getType().toString());
- memberDefinition = member;
- }
- }
- }
- }
- return memberDefinition;
- }
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/EditStringRetrievalStrategy.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/EditStringRetrievalStrategy.java
deleted file mode 100644
index 752469be8e5..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/generation/EditStringRetrievalStrategy.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet (CEA LIST)
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.generation;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.uml.alf.MappingError;
-import org.eclipse.papyrus.uml.alf.UMLMapper;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Property;
-
-public abstract class EditStringRetrievalStrategy {
-
- /**
- * Provide a resource containing the ALF model corresponding to the given UML element
- *
- * @param UMLelement
- * - the element from which the ALF model is computed
- * @return alfModelResource - the resource containing the ALF model
- */
- protected Resource getAlfModel(NamedElement UMLelement) {
- UMLMapper mapper = new UMLMapper();
- Resource alfModelResource = null;
- try {
- if (UMLelement instanceof Property) {
- alfModelResource = mapper.map(((Property) UMLelement).getNamespace());
- } else {
- alfModelResource = mapper.map(UMLelement);
- }
- } catch (MappingError e) {
- e.printStackTrace();
- }
- return alfModelResource;
- }
-
- public abstract String getEditString(Element element);
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/AlfCompareEditor.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/AlfCompareEditor.java
deleted file mode 100644
index 9388f4f7de1..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/AlfCompareEditor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet (CEA LIST)
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.merge.manual;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.compare.CompareConfiguration;
-import org.eclipse.compare.CompareEditorInput;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.papyrus.uml.alf.text.representation.AlfTextualRepresentation;
-
-public class AlfCompareEditor extends CompareEditorInput {
-
- protected final AlfTextualRepresentation registeredRep;
-
- protected final AlfTextualRepresentation generatedRep;
-
- public AlfCompareEditor(AlfTextualRepresentation registeredTextualRepresentation,
- AlfTextualRepresentation generatedTextualRepresentation) {
- super(new CompareConfiguration());
- this.registeredRep = registeredTextualRepresentation;
- this.generatedRep = generatedTextualRepresentation;
- }
-
- @Override
- protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- return null;
- }
-
- @Override
- public void saveChanges(IProgressMonitor monitor) throws CoreException {
- super.saveChanges(monitor);
- }
-
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/MergeActionDialog.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/MergeActionDialog.java
deleted file mode 100644
index 66d79baa526..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/merge/manual/MergeActionDialog.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.merge.manual;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.NamedElement;
-
-public class MergeActionDialog extends TitleAreaDialog {
-
- protected NamedElement modelElement;
-
- protected final int WIDTH = 590;
-
- protected final int HEIGHT = 280;
-
- private List<Button> checkboxes;
-
- private int returnCode;
-
- private final String REBASE_MSG = "Abandon the modifications you previously saved for this element";
- private final String MERGE_MSG = "Merge your ongoing modifications with the current state of this element [under construction]";
- private final String RECONCILE_MSG = "Try to automatically reconcile your ongoing modifications with the current state of this element (risky)";
-
- public static final int REBASE = 0;
- public static final int MERGE = 1;
- public static final int RECONCILE = 2;
-
- public MergeActionDialog(Shell parent, NamedElement modelElement) {
- super(parent);
- this.returnCode = 0;
- this.modelElement = modelElement;
- this.checkboxes = new ArrayList<Button>();
- }
-
- public void create() {
- super.create();
- this.setTitle("Warning");
- String value = "You have ongoing changes this model element: ";
- value += this.modelElement.getName() == null ? "<unknown>" : this.modelElement.getName();
- value += " (" + this.modelElement.eClass().getInstanceTypeName() + ")";
- this.setMessage(value, IMessageProvider.WARNING);
- this.getShell().setText("Potential conflict(s) detected");
- this.getShell().setSize(WIDTH, HEIGHT);
- Rectangle parentShellBounds = this.getParentShell().getBounds();
- this.getShell().setLocation((parentShellBounds.width - WIDTH) / 2 + parentShellBounds.x,
- (parentShellBounds.height - HEIGHT) / 2 + parentShellBounds.y);
- }
-
- protected Control createDialogArea(Composite parent) {
- Composite area = (Composite) super.createDialogArea(parent);
- Composite container = new Composite(area, SWT.NONE);
- GridLayout layout = new GridLayout();
- GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
- container.setLayoutData(data);
- container.setLayout(layout);
- this.createActionGroup(container);
- return area;
- }
-
- private void createActionGroup(Composite parent) {
- Group actionsGroup = new Group(parent, SWT.NONE);
- actionsGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
- RowLayout layout = new RowLayout();
- layout.type = SWT.VERTICAL;
- layout.spacing = 12;
- actionsGroup.setLayout(layout);
- this.checkboxes.add(this.createAction(actionsGroup, true, REBASE_MSG));
- Button merge = this.createAction(actionsGroup, false, MERGE_MSG);
- merge.setEnabled(false);
- this.checkboxes.add(merge);
- this.checkboxes.add(this.createAction(actionsGroup, false, RECONCILE_MSG));
- this.returnCode = REBASE;
- }
-
- private Button createAction(Composite parent, final boolean checked, final String message) {
- Button checkbox = new Button(parent, SWT.CHECK);
- checkbox.setSelection(checked);
- checkbox.setText(message);
- checkbox.addSelectionListener(new CheckboxSelectionListener());
- return checkbox;
- }
-
- @Override
- public int getReturnCode() {
- if (super.getReturnCode() != 0) {
- this.returnCode = super.getReturnCode();
- }
- return this.returnCode;
- }
-
- private class CheckboxSelectionListener extends SelectionAdapter {
-
- public void widgetSelected(SelectionEvent e) {
- for (Button checkbox : MergeActionDialog.this.checkboxes) {
- if (checkbox == e.getSource()) {
- checkbox.setSelection(true);
- if (checkbox.getText().equals(REBASE_MSG)) {
- MergeActionDialog.this.returnCode = REBASE;
- } else if (checkbox.getText().equals(MERGE_MSG)) {
- MergeActionDialog.this.returnCode = MERGE;
- } else {
- MergeActionDialog.this.returnCode = RECONCILE;
- }
- } else {
- checkbox.setSelection(false);
- }
- }
- }
- }
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java
deleted file mode 100644
index 8616893ffb1..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet (CEA LIST)
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.representation;
-
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.compare.IModificationDate;
-import org.eclipse.compare.rangedifferencer.IRangeComparator;
-import org.eclipse.compare.rangedifferencer.RangeDifference;
-import org.eclipse.compare.rangedifferencer.RangeDifferencer;
-import org.eclipse.papyrus.uml.alf.libraries.helper.BackupState;
-import org.eclipse.papyrus.uml.alf.libraries.helper.BackupState.EditionStatus;
-import org.eclipse.papyrus.uml.alf.text.representation.compare.LineComparator;
-import org.eclipse.papyrus.uml.alf.text.representation.compare.LineDifference;
-import org.eclipse.papyrus.uml.alf.text.representation.compare.StringUtil;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.uml2.uml.NamedElement;
-
-public class AlfTextualRepresentation extends TextualRepresentation
- implements IAlfTextualRepresentation, IModificationDate {
-
- protected BackupState editionState;
-
- public AlfTextualRepresentation(NamedElement owner) {
- super(owner);
- this.editionState = new BackupState();
- }
-
- public boolean isSaved() {
- return this.editionState.status.equals(EditionStatus.SAVED);
- }
-
- public boolean isMerged() {
- return this.editionState.status.equals(EditionStatus.MERGED);
- }
-
- public void setEditionState(BackupState state) {
- this.editionState.timestamp = state.timestamp;
- this.editionState.status = state.status;
- }
-
- public BackupState getEditionState() {
- return this.editionState;
- }
-
- public EditionStatus getStatus() {
- if (this.editionState != null) {
- return this.editionState.status;
- }
- return null;
- }
-
- public long getModificationDate() {
- return this.editionState.timestamp.getTime();
- }
-
- /**
- * Two representations are considered as different since the set of differences is not empty
- */
- public boolean isDifferent(AlfTextualRepresentation representation) {
- return !this.compare(representation).isEmpty();
- }
-
- /**
- * Returns the set of differences found between two representations
- */
- public List<LineDifference> compare(AlfTextualRepresentation representation) {
- /* 1. Build comparator for each representation */
- IRangeComparator left = this.getRangeComparator();
- IRangeComparator right = representation.getRangeComparator();
- /* 2. Perform the differencing */
- RangeDifference[] differences = RangeDifferencer.findDifferences(left, right);
- /* 3. Build the result list */
- List<LineDifference> results = new ArrayList<LineDifference>();
- for (RangeDifference difference : differences) {
- results.add(new LineDifference(difference, this, representation, left, right));
- }
- return results;
- }
-
- public boolean merge(AlfTextualRepresentation representation) {
- // TODO
- return true;
- }
-
- /**
- * Heuristic to reconcile to different textual representation of the same model element.
- * If possible changes in <code>representation</code> are propagated into the current textual representation.
- * There is no guarantee that the reconciliation phase does not introduce loss of data.
- *
- * @return this - the current textual representation
- */
- public AlfTextualRepresentation reconcile(AlfTextualRepresentation representation) {
- StringBuilder builder = new StringBuilder(this.text);
- int offset = 0;
- /* 1. Compute the list of differences */
- Iterator<LineDifference> differenceIterator = this.compare(representation).iterator();
- /* 2. Try to reconcile differences */
- while (differenceIterator.hasNext()) {
-
- /* 2.1. Retrieve the current difference and extract the position of the region to change (left) */
- LineDifference difference = differenceIterator.next();
- Point leftFragmentPosition = difference.getLeftFragmentPosition();
-
- /* 2.2. Split the regions impacted by the difference into lines */
- StringBuilder leftHandSideBuilder = new StringBuilder();
- String[] leftLines = difference.getLeftState().split(StringUtil.EOL);
- String[] rightLines = difference.getRightState().split(StringUtil.EOL);
- int maxLineCount = Math.max(leftLines.length, rightLines.length);
-
- /*
- * 2.3. Integrate changes from left to right. In case where left hand side and right side
- * have different sizes:
- * A. right > left -> remaining lines in the right are preserved
- * B. left > right -> remaining lines are integrated to the right
- */
- for (int i = 0; i < maxLineCount; i++) {
-
- /* 2.3.1 Both sides have a definition of the same line */
- if (i < leftLines.length && i < rightLines.length) {
- if (!StringUtil.isNegligible(rightLines[i])) {
- leftHandSideBuilder.append(rightLines[i] + StringUtil.EOL);
- } else {
- leftHandSideBuilder.append(leftLines[i] + StringUtil.EOL);
- }
- } else {
- /* 2.3.2. The left side is larger than the right hand side */
- if (i < leftLines.length) {
- leftHandSideBuilder.append(leftLines[i] + StringUtil.EOL);
- } else {
- leftHandSideBuilder.append(rightLines[i] + StringUtil.EOL);
- }
- }
- }
-
- /* 2.4. Apply the change in the original representation */
- builder.delete(leftFragmentPosition.x + offset, leftFragmentPosition.y + offset);
- builder.insert(leftFragmentPosition.x + offset, leftHandSideBuilder);
- offset += leftHandSideBuilder.length() - difference.getLeftState().length();
- }
-
- /* 3. Delete the EOF separator added previously at the end and replace text of the current representation */
- if (builder.charAt(builder.length() - 1) == StringUtil.CHAR_EOL) {
- builder.deleteCharAt(builder.length());
- }
- this.setText(builder.toString());
- return this;
- }
-
- /**
- * Rebase the current ALF representation onto the representation provided as parameter
- * A rebase can only work if two representation concerns the same model element
- *
- * @return this - the current textual representation
- */
- public AlfTextualRepresentation rebase(AlfTextualRepresentation representation) {
- if (representation!= null && this.getOwner() == representation.getOwner()) {
- BackupState state = new BackupState();
- state.status = representation.getStatus();
- state.timestamp = new Timestamp(representation.getModificationDate());
- this.setEditionState(state);
- this.setText(representation.getContent());
- }
- return this;
- }
-
- /**
- * Provide the comparator to be used to compare two textual representation
- */
- protected IRangeComparator getRangeComparator() {
- return new LineComparator(this.text);
- }
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/IAlfTextualRepresentation.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/IAlfTextualRepresentation.java
deleted file mode 100644
index 234607fe31c..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/IAlfTextualRepresentation.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.representation;
-
-import java.util.List;
-
-import org.eclipse.papyrus.uml.alf.text.representation.compare.LineDifference;
-
-public interface IAlfTextualRepresentation {
-
- public boolean isDifferent(AlfTextualRepresentation representation);
-
- public List<LineDifference> compare(AlfTextualRepresentation representation);
-
- public boolean merge(AlfTextualRepresentation representation);
-
- public AlfTextualRepresentation reconcile(AlfTextualRepresentation representation);
-
- public AlfTextualRepresentation rebase(AlfTextualRepresentation representation);
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/TextualRepresentation.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/TextualRepresentation.java
deleted file mode 100644
index b634c83ec9a..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/TextualRepresentation.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet (CEA LIST)
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.representation;
-
-import java.io.InputStream;
-
-import org.eclipse.compare.IStreamContentAccessor;
-import org.eclipse.compare.ITypedElement;
-import org.eclipse.compare.rangedifferencer.IRangeComparator;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.xtext.util.StringInputStream;
-
-public abstract class TextualRepresentation
- implements IStreamContentAccessor, ITypedElement {
-
- protected NamedElement owner;
-
- protected Comment source;
-
- protected String text;
-
- public TextualRepresentation() {
- }
-
- public TextualRepresentation(NamedElement owner) {
- this.owner = owner;
- }
-
- public Comment getSource() {
- return this.source;
- }
-
- public void setSource(Comment source) {
- this.source = source;
- }
-
- public NamedElement getOwner() {
- return this.owner;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- public String getContent() {
- return this.text;
- }
-
- public String getName() {
- if (this.getOwner() != null) {
- return this.getOwner().getName();
- }
- return null;
- }
-
- public Image getImage() {
- return null;
- }
-
- public String getType() {
- return ITypedElement.TEXT_TYPE;
- }
-
- public InputStream getContents() throws CoreException {
- return new StringInputStream(this.text);
- }
-
- /**
- * Be detached means the textual representation is not attached to a particular comment
- *
- * @return true if no source exists false otherwise
- */
- public boolean isDetached() {
- return this.source == null;
- }
-
- /**
- * Obtain a comparator from the textual representation in order to let the text
- * be compared using range differencing strategy to another textual representation
- *
- * @return
- */
- protected abstract IRangeComparator getRangeComparator();
-
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/IAdvancedDifference.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/IAdvancedDifference.java
deleted file mode 100644
index 0a289fa903d..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/IAdvancedDifference.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet (CEA LIST)
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.representation.compare;
-
-import org.eclipse.swt.graphics.Point;
-
-public interface IAdvancedDifference {
-
- /**
- * Provide the start index and the end index of the region concerned by the modification (at the left)
- */
- Point getLeftFragmentPosition();
-
- /**
- * Provide the start index and the end index of the region concerned by the modification (at the right)
- */
- Point getRightFragmentPosition();
-
- /**
- * Returns the region of the left hand side representation concerned by the difference
- */
- String getLeftState();
-
- /**
- * Returns the region of the right hand side representation concerned by the difference
- */
- String getRightState();
-
-
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineComparator.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineComparator.java
deleted file mode 100644
index 9647b1a854e..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineComparator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet (CEA LIST)
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.representation.compare;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.compare.rangedifferencer.IRangeComparator;
-
-public class LineComparator implements IRangeComparator {
-
- private List<String> lines;
-
- public LineComparator(final String content) {
- this.lines = new ArrayList<String>();
- for (String line : content.split("\n")) {
- lines.add(line);
- }
- }
-
- public String getLine(int index) {
- return this.lines.get(index);
- }
-
- @Override
- public int getRangeCount() {
- return this.lines.size();
- }
-
- @Override
- public boolean rangesEqual(int thisIndex, IRangeComparator other, int otherIndex) {
- String l1 = this.lines.get(thisIndex);
- String l2 = ((LineComparator) other).lines.get(otherIndex);
- return l1.equals(l2);
- }
-
- @Override
- public boolean skipRangeComparison(int length, int maxLength, IRangeComparator other) {
- return false;
- }
-
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineDifference.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineDifference.java
deleted file mode 100644
index d3c7952b405..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/LineDifference.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.representation.compare;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.compare.contentmergeviewer.ITokenComparator;
-import org.eclipse.compare.contentmergeviewer.TokenComparator;
-import org.eclipse.compare.rangedifferencer.IRangeComparator;
-import org.eclipse.compare.rangedifferencer.RangeDifference;
-import org.eclipse.compare.rangedifferencer.RangeDifferencer;
-import org.eclipse.papyrus.uml.alf.text.representation.AlfTextualRepresentation;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * This class represent a difference between regions of two representations
- */
-public class LineDifference extends RegionDifference implements IAdvancedDifference {
-
- public LineDifference(RangeDifference d, AlfTextualRepresentation leftR,
- AlfTextualRepresentation rightR, IRangeComparator leftC, IRangeComparator rightC) {
- super(d, leftR, rightR, leftC, rightC);
- }
-
- public String getLeftState() {
- Point position = this.getLeftFragmentPosition();
- return this.leftR.getContent().substring(position.x, position.y);
- }
-
- public String getRightState() {
- Point position = this.getRightFragmentPosition();
- return this.rightR.getContent().substring(position.x, position.y);
- }
-
- public Point getLeftFragmentPosition() {
- String[] leftLines = this.leftR.getContent().split(StringUtil.EOL);
- int startIndex = 0;
- for (int i = 0; i < this.leftStart; i++) {
- startIndex += leftLines[i].length() + 1;
- }
- int endIndex = startIndex;
- for (int i = this.leftStart; i < this.leftEnd(); i++) {
- if (this.leftEnd() == leftLines.length) {
- endIndex += leftLines[i].length();
- } else {
- endIndex += leftLines[i].length() + 1;
- }
- }
- return new Point(startIndex, endIndex);
- }
-
- public Point getRightFragmentPosition() {
- String[] rightLines = this.rightR.getContent().split(StringUtil.EOL);
- int startIndex = 0;
- for (int i = 0; i < this.rightStart; i++) {
- startIndex += rightLines[i].length() + 1;
- }
- int endIndex = startIndex;
- for (int i = this.rightStart; i < this.rightEnd(); i++) {
- if (this.rightEnd() == rightLines.length) {
- endIndex += rightLines[i].length();
- } else {
- endIndex += rightLines[i].length() + 1;
- }
- }
- return new Point(startIndex, endIndex);
- }
-
- /**
- * return all the differences between tokens present in the left line and
- * those present at the right line
- *
- * @return tokenDifferences - the list of differences
- */
- public List<TokenDifference> getChildren() {
- ITokenComparator leftTokenComparator = new TokenComparator(this.getLeftState());
- ITokenComparator rightTokenComparator = new TokenComparator(this.getRightState());
- AlfTextualRepresentation leftRepresentation = new AlfTextualRepresentation(null);
- leftRepresentation.setText(this.getLeftState());
- AlfTextualRepresentation rightRepresentation = new AlfTextualRepresentation(null);
- leftRepresentation.setText(this.getRightState());
- RangeDifference[] differences = RangeDifferencer.findDifferences(leftTokenComparator, rightTokenComparator);
- List<TokenDifference> tokenDifferences = new ArrayList<TokenDifference>();
- for (RangeDifference difference : differences) {
- tokenDifferences.add(new TokenDifference(difference, leftRepresentation, rightRepresentation, leftTokenComparator, rightTokenComparator));
- }
- return tokenDifferences;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/RegionDifference.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/RegionDifference.java
deleted file mode 100644
index 7d6d101033b..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/RegionDifference.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.papyrus.uml.alf.text.representation.compare;
-
-import org.eclipse.compare.rangedifferencer.IRangeComparator;
-import org.eclipse.compare.rangedifferencer.RangeDifference;
-import org.eclipse.papyrus.uml.alf.text.representation.AlfTextualRepresentation;
-
-public abstract class RegionDifference extends RangeDifference implements IAdvancedDifference {
-
- /**
- * The left hand side comparator
- */
- protected IRangeComparator leftC;
-
- /**
- * The right hand side comparator
- */
- protected IRangeComparator rightC;
-
- /**
- * The left side representation
- */
- protected AlfTextualRepresentation leftR;
-
- /**
- * The right side representation
- */
- protected AlfTextualRepresentation rightR;
-
- protected RegionDifference(RangeDifference d, AlfTextualRepresentation leftR,
- AlfTextualRepresentation rightR, IRangeComparator leftC, IRangeComparator rightC) {
- this(d.kind(), d.rightStart(), d.rightLength(), d.leftStart(),
- d.leftLength(), d.ancestorStart(), d.ancestorLength());
- this.leftC = leftC;
- this.rightC = rightC;
- this.leftR = leftR;
- this.rightR = rightR;
- }
-
- public RegionDifference(int kind, int rightStart, int rightLength, int leftStart, int leftLength,
- int ancestorStart, int ancestorLength) {
- super(kind, rightStart, rightLength, leftStart, leftLength, ancestorStart, ancestorLength);
- }
-
- /**
- * Return true if the current difference represents a deletion. Typically a deletion means
- * a member in the right state disappeared in the left state
- */
- public boolean isDeletion() {
- return !StringUtil.isNegligible(this.getLeftState()) && StringUtil.isNegligible(this.getRightState());
- }
-
- /**
- * Return true if the current difference represents an addition. An addition is the exact reverse
- * of a deletion (i.e. we have a member in the left that does exists in the right states).
- */
- public boolean isAddition() {
- return StringUtil.isNegligible(this.getLeftState()) && !StringUtil.isNegligible(this.getRightState());
- }
-
- /**
- * Return true if the current difference represents a change. A change is an update of a member
- * existing in the right state
- */
- public boolean isChange() {
- return !StringUtil.isNegligible(this.getLeftState()) && !StringUtil.isNegligible(this.getRightState());
- }
-
- public String toString() {
- String serialization = "\n=======================DIFF=======================\n";
- serialization += this.getLeftState();
- serialization += "\n==================================================\n";
- serialization += this.getRightState();
- serialization += "\n=====================END DIFF=====================\n";
- return serialization;
- }
-
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/StringUtil.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/StringUtil.java
deleted file mode 100644
index e3120567d8d..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/StringUtil.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.representation.compare;
-
-public class StringUtil {
-
- public static final char CHAR_EOL = '\n';
- public static final String EOL = "\n";
-
- /**
- * Return true if the given string is not negligible to be used in a comparison
- *
- * @param str
- * - the assessed string
- * @return negligible
- */
- public static final boolean isNegligible(String str) {
- boolean negligible = true;
- if (!str.isEmpty()) {
- int i = 0;
- while (negligible && i < str.length()) {
- if (str.charAt(i) != '\n'
- && str.charAt(i) != '\r'
- && str.charAt(i) != ' '
- && str.charAt(i) != '\t') {
- negligible = false;
- }
- i++;
- }
- }
- return negligible;
- }
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/TokenDifference.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/TokenDifference.java
deleted file mode 100644
index f1ffebdd9de..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/compare/TokenDifference.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet (CEA LIST)
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.representation.compare;
-
-import org.eclipse.compare.contentmergeviewer.ITokenComparator;
-import org.eclipse.compare.rangedifferencer.IRangeComparator;
-import org.eclipse.compare.rangedifferencer.RangeDifference;
-import org.eclipse.papyrus.uml.alf.text.representation.AlfTextualRepresentation;
-import org.eclipse.swt.graphics.Point;
-
-public class TokenDifference extends RegionDifference implements IAdvancedDifference {
-
- public TokenDifference(RangeDifference d, AlfTextualRepresentation leftR,
- AlfTextualRepresentation rightR, IRangeComparator leftC, IRangeComparator rightC) {
- super(d, leftR, rightR, leftC, rightC);
- }
-
- public String getLeftState() {
- String result = "";
- int startIndex = ((ITokenComparator) this.leftC).getTokenStart(this.leftStart);
- int endIndex = 0;
- for (int i = this.leftStart; i <= this.leftEnd(); i++) {
- endIndex += ((ITokenComparator) this.leftC).getTokenLength(i);
- }
- result = this.leftR.getContent().substring(startIndex, startIndex + endIndex);
- return result;
- }
-
- @Override
- public String getRightState() {
- String result = "";
- int endIndex = 0;
- int startIndex = ((ITokenComparator) this.rightC).getTokenStart(this.rightStart);
- for (int i = this.rightStart; i <= this.rightEnd(); i++) {
- endIndex += ((ITokenComparator) this.rightC).getTokenLength(i);
- }
- result = this.rightR.getContent().substring(startIndex, startIndex + endIndex);
- return result;
- }
-
- public Point getLeftFragmentPosition() {
- return new Point(((ITokenComparator) this.leftC).getTokenStart(this.leftStart),
- ((ITokenComparator) this.leftC).getTokenStart(this.leftEnd()) + ((ITokenComparator) this.leftC).getTokenLength(this.leftEnd()));
- }
-
- public Point getRightFragmentPosition() {
- return new Point(((ITokenComparator) this.rightC).getTokenStart(this.rightStart),
- ((ITokenComparator) this.rightC).getTokenStart(this.rightEnd()) + ((ITokenComparator) this.rightC).getTokenLength(this.rightEnd()));
- }
-
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParser.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParser.java
deleted file mode 100644
index b6496533214..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParser.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jeremie Tatibouet
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.representation.util;
-
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-import org.eclipse.papyrus.uml.alf.libraries.helper.AlfUtil;
-import org.eclipse.papyrus.uml.alf.libraries.helper.BackupState;
-import org.eclipse.papyrus.uml.alf.libraries.helper.BackupUtil;
-import org.eclipse.papyrus.uml.alf.libraries.helper.BackupState.EditionStatus;
-import org.eclipse.papyrus.uml.alf.text.generation.DefaultEditStringRetrievalStrategy;
-import org.eclipse.papyrus.uml.alf.text.representation.AlfTextualRepresentation;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Stereotype;
-
-public class RepresentationParser {
-
- private static RepresentationParser parser;
-
- private BackupUtil helperBackup;
-
- private AlfUtil helperAlf;
-
- private RepresentationParser() {
- this.helperBackup = BackupUtil.getInstance();
- this.helperAlf = AlfUtil.getInstance();
- }
-
- public static RepresentationParser getInstance() {
- if (parser == null) {
- parser = new RepresentationParser();
- }
- return parser;
- }
-
- /**
- * Load the textual representation attached to a model element which is a NamedElement
- *
- * @param modelElement
- * @return representation
- * @throws RepresentationParsingError
- */
- public AlfTextualRepresentation parse(NamedElement modelElement) throws RepresentationParsingError {
- if (modelElement == null) {
- throw new RepresentationParsingError(
- "The model element for which the representation is calculated cannot be null");
- }
- AlfTextualRepresentation representation = new AlfTextualRepresentation(modelElement);
- Comment comment = helperAlf.getTextualRepresentationComment(modelElement);
- if (comment != null) {
- representation.setSource(comment);
- representation.setText(comment.getBody());
- if (helperBackup.isBackup(comment)) {
- Stereotype backup = helperBackup.getBackupStereotype(modelElement);
- if (backup != null) {
- representation.setEditionState(helperBackup.getBackupState(comment));
- }
- }
- } else {
- representation.setText(new DefaultEditStringRetrievalStrategy().getGeneratedEditString(modelElement));
- }
- return representation;
- }
-
- /**
- * Capture the textual representation of a model element. It does not returns an already registered representation
- * associated to this element. It captures the current state of a model element.
- *
- * @param modelElement
- * @return representation
- * @throws RepresentationParsingError
- */
- public AlfTextualRepresentation getSnapshot(NamedElement modelElement) throws RepresentationParsingError {
- if (modelElement == null) {
- throw new RepresentationParsingError(
- "The model element for which the representation is calculated cannot be null");
- }
- AlfTextualRepresentation representation = new AlfTextualRepresentation(modelElement);
- representation.setText(new DefaultEditStringRetrievalStrategy().getGeneratedEditString(modelElement));
- representation.setEditionState(new BackupState(
- new Timestamp(Calendar.getInstance().getTimeInMillis()),
- EditionStatus.MERGED));
- return representation;
- }
-}
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParsingError.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParsingError.java
deleted file mode 100644
index fbc6e82baef..00000000000
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/util/RepresentationParsingError.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * J�r�mie Tatibouet (CEA LIST)
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.alf.text.representation.util;
-
-@SuppressWarnings("serial")
-public class RepresentationParsingError extends Exception {
-
- public RepresentationParsingError() {
- }
-
- public RepresentationParsingError(String arg0) {
- super(arg0);
- }
-}

Back to the top