Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2018-01-09 10:09:46 +0000
committerQuentin Le Menez2018-01-09 13:18:15 +0000
commitd98116b5b376f18b6cf626ba4158a35fe9a4a64e (patch)
tree4458c9c5ada0a216b385813a56ea9a9b8c7b6509 /plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading
parent453e99bc2dcbd5fabad100f9d0d5f682013c3b19 (diff)
downloadorg.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.tar.gz
org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.tar.xz
org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.zip
Bug 515367 - [releng] Uniformization of the end of lines to Unix standard
- Format the EOL of all the files matched by: grep -rIUs . | xargs -Ifile dos2unix -k 'file' Change-Id: I5c41d540a9a67b50de9b912ab35e16cc9a912961 Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading')
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs582
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF34
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/about.html56
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties24
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties24
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml20
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd230
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadedAuthorizedResource.exsd198
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd256
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd242
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java142
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java582
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java180
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java158
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java84
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java68
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java94
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java96
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java70
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java572
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties36
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java68
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java82
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties26
24 files changed, 1962 insertions, 1962 deletions
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..b3aa6d60f94 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
index 43b85bdbce7..f8767b13c3b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.services.resourceloading,
- org.eclipse.papyrus.infra.services.resourceloading.impl;x-internal:=true,
- org.eclipse.papyrus.infra.services.resourceloading.strategies,
- org.eclipse.papyrus.infra.services.resourceloading.util
-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.services.resourceloading,
+ org.eclipse.papyrus.infra.services.resourceloading.impl;x-internal:=true,
+ org.eclipse.papyrus.infra.services.resourceloading.strategies,
+ org.eclipse.papyrus.infra.services.resourceloading.util
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.services.resourceloading.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/about.html b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/about.html
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties
index cf9282badfb..53519f4096e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/build.properties
@@ -1,12 +1,12 @@
-#
-#Mon Sep 12 09:29:40 CEST 2011
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- schema/,\
- plugin.properties,\
- about.html,\
- src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
-output.. = bin/
-src.includes = about.html
-source.. = src/
+#
+#Mon Sep 12 09:29:40 CEST 2011
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ schema/,\
+ plugin.properties,\
+ about.html,\
+ src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
+output.. = bin/
+src.includes = about.html
+source.. = src/
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties
index 8fddbce754b..fb34e6b3650 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################
-# Copyright (c) 2008 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
-##################################################################################
-pluginName=Papyrus Resource Loading
-providerName=Eclipse Modeling Project
+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
+##################################################################################
+pluginName=Papyrus Resource Loading
+providerName=Eclipse Modeling Project
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
index 7e301191b5d..3eec339253d 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.eclipse.papyrus.infra-services</artifactId>
- <groupId>org.eclipse.papyrus</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>org.eclipse.papyrus.infra.services.resourceloading</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.papyrus.infra-services</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.infra.services.resourceloading</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd
index c1e2d9a4e5c..c1db63a9a1f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/currentStrategyChooser.exsd
@@ -1,115 +1,115 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.services.resourceloading" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.papyrus.infra.services.resourceloading" id="currentStrategyChooser" name="Current Strategy Chooser"/>
- </appinfo>
- <documentation>
- Extension point that provides the current loading strategy to the proxy manager.
-Proxy manager load the resource if needed, according to the current strategy
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="CurrentStrategyChooser"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="CurrentStrategyChooser">
- <complexType>
- <attribute name="chooser" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- MDT Papyrus 0.7.0 M7
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- StrategyChooser is implemenred to set up preferences mecanism. User can choose a specified strategy to load its models
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiinfo"/>
- </appinfo>
- <documentation>
- The concrete strategy class must implement the interface IStrategyChooser
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="implementation"/>
- </appinfo>
- <documentation>
- none
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright (c) 2010 Atos Origin.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- </documentation>
- </annotation>
-
-</schema>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.services.resourceloading" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="org.eclipse.papyrus.infra.services.resourceloading" id="currentStrategyChooser" name="Current Strategy Chooser"/>
+ </appinfo>
+ <documentation>
+ Extension point that provides the current loading strategy to the proxy manager.
+Proxy manager load the resource if needed, according to the current strategy
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="CurrentStrategyChooser"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="CurrentStrategyChooser">
+ <complexType>
+ <attribute name="chooser" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="since"/>
+ </appinfo>
+ <documentation>
+ MDT Papyrus 0.7.0 M7
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="examples"/>
+ </appinfo>
+ <documentation>
+ StrategyChooser is implemenred to set up preferences mecanism. User can choose a specified strategy to load its models
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="apiinfo"/>
+ </appinfo>
+ <documentation>
+ The concrete strategy class must implement the interface IStrategyChooser
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="implementation"/>
+ </appinfo>
+ <documentation>
+ none
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="copyright"/>
+ </appinfo>
+ <documentation>
+ Copyright (c) 2010 Atos Origin.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+ </documentation>
+ </annotation>
+
+</schema>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadedAuthorizedResource.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadedAuthorizedResource.exsd
index 893a1b9be4b..b2321c5eda5 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadedAuthorizedResource.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadedAuthorizedResource.exsd
@@ -1,99 +1,99 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.core.resourceloading" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.papyrus.core.resourceloading" id="loadedAuthorizedResource" name="loadedAuthorizedResource"/>
- </appinfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="uri">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="loadedAuthorizedResource" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="loadedAuthorizedResource">
- <complexType>
- <attribute name="uri" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiinfo"/>
- </appinfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="implementation"/>
- </appinfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
-
-</schema>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.core.resourceloading" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="org.eclipse.papyrus.core.resourceloading" id="loadedAuthorizedResource" name="loadedAuthorizedResource"/>
+ </appinfo>
+ <documentation>
+ [Enter description of this extension point.]
+ </documentation>
+ </annotation>
+
+ <element name="uri">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="loadedAuthorizedResource" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="loadedAuthorizedResource">
+ <complexType>
+ <attribute name="uri" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="since"/>
+ </appinfo>
+ <documentation>
+ [Enter the first release in which this extension point appears.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="examples"/>
+ </appinfo>
+ <documentation>
+ [Enter extension point usage example here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="apiinfo"/>
+ </appinfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="implementation"/>
+ </appinfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+
+</schema>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd
index fa340fcd1f7..319b27779b4 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategy.exsd
@@ -1,128 +1,128 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.papyrus.infra.core" id="loadingStrategy" name="Model Loading Strategy"/>
- </appInfo>
- <documentation>
- Extension point to load the model and resolve objects according to a specified strategy.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="loadingStrategy" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="loadingStrategy">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- must be integer
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string" use="required">
- <annotation>
- <documentation>
- A readable description.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="strategy" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- MDT Papyrus 0.7.0 M7
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- You can use startegy to avoid loading all the needed resources for a model.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiinfo"/>
- </appInfo>
- <documentation>
- The concrete strategy class must implement the interface ILoadingStrategy
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- none
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2010 Atos Origin.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- </documentation>
- </annotation>
-
-</schema>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appInfo>
+ <meta.schema plugin="org.eclipse.papyrus.infra.core" id="loadingStrategy" name="Model Loading Strategy"/>
+ </appInfo>
+ <documentation>
+ Extension point to load the model and resolve objects according to a specified strategy.
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="loadingStrategy" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute translatable="true"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="loadingStrategy">
+ <complexType>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+ must be integer
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="description" type="string" use="required">
+ <annotation>
+ <documentation>
+ A readable description.
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="strategy" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="since"/>
+ </appInfo>
+ <documentation>
+ MDT Papyrus 0.7.0 M7
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="examples"/>
+ </appInfo>
+ <documentation>
+ You can use startegy to avoid loading all the needed resources for a model.
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="apiinfo"/>
+ </appInfo>
+ <documentation>
+ The concrete strategy class must implement the interface ILoadingStrategy
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="implementation"/>
+ </appInfo>
+ <documentation>
+ none
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="copyright"/>
+ </appInfo>
+ <documentation>
+ Copyright (c) 2010 Atos Origin.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+ </documentation>
+ </annotation>
+
+</schema>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd
index dedf6445961..83c3c3ee926 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/schema/loadingStrategyExtender.exsd
@@ -1,121 +1,121 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.papyrus.infra.core" id="loadingStrategyExtender" name="loadingStrategyExtender"/>
- </appInfo>
- <documentation>
- Extension point that enables to extend the current loading strategy with a specific behavior
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="strategyExtender" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="strategyExtender">
- <complexType>
- <attribute name="description" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="strategyExtension" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- MDT Papyrus 0.7.0 M7
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- Add an extension to load UML profiles with the current strategy. The behavior is uml dependant
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiinfo"/>
- </appInfo>
- <documentation>
- The strategy extension class must implement the interface ILoadingStrategyExtension
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- none
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2010 Atos Origin.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- </documentation>
- </annotation>
-
-</schema>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appInfo>
+ <meta.schema plugin="org.eclipse.papyrus.infra.core" id="loadingStrategyExtender" name="loadingStrategyExtender"/>
+ </appInfo>
+ <documentation>
+ Extension point that enables to extend the current loading strategy with a specific behavior
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="strategyExtender" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute translatable="true"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="strategyExtender">
+ <complexType>
+ <attribute name="description" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="strategyExtension" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="since"/>
+ </appInfo>
+ <documentation>
+ MDT Papyrus 0.7.0 M7
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="examples"/>
+ </appInfo>
+ <documentation>
+ Add an extension to load UML profiles with the current strategy. The behavior is uml dependant
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="apiinfo"/>
+ </appInfo>
+ <documentation>
+ The strategy extension class must implement the interface ILoadingStrategyExtension
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="implementation"/>
+ </appInfo>
+ <documentation>
+ none
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="copyright"/>
+ </appInfo>
+ <documentation>
+ Copyright (c) 2010 Atos Origin.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+ </documentation>
+ </annotation>
+
+</schema>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java
index 9954f05d6a3..89beb3bcb1a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Activator.java
@@ -1,71 +1,71 @@
-package org.eclipse.papyrus.infra.services.resourceloading;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.resourceloading"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- public static LogHelper log;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- log = new LogHelper(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- /**
- * Log an error
- *
- * @param e
- * error to log
- */
- public static void logError(Exception e) {
- Status err = new Status(IStatus.ERROR, PLUGIN_ID, e.getMessage(), e);
- getDefault().getLog().log(err);
- }
-
-}
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends Plugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.resourceloading"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ public static LogHelper log;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ log = new LogHelper(this);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+ /**
+ * Log an error
+ *
+ * @param e
+ * error to log
+ */
+ public static void logError(Exception e) {
+ Status err = new Status(IStatus.ERROR, PLUGIN_ID, e.getMessage(), e);
+ getDefault().getLog().log(err);
+ }
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java
index d0e60036aa9..d30464af26a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ControledResourceAdapter.java
@@ -1,291 +1,291 @@
-/*****************************************************************************
- * Copyright (c) 2010 ATOS ORIGIN.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
-
-/**
- * This adapter maintains a map linking url and the corresponding ControledResource
- *
- * @author tfaure
- *
- */
-public class ControledResourceAdapter implements Adapter.Internal {
-
- /**
- * The map accesed
- */
- private Map<String, List<ControledResource>> resources = new HashMap<String, List<ControledResource>>();
-
- private ModelSet modelSet = null;
-
- public ControledResourceAdapter(ModelSet modelSet) {
- this.modelSet = modelSet;
- manageAllControledResources();
- modelSet.eAdapters().add(this);
- }
-
- protected void put(ControledResource controled) {
- List<ControledResource> list = resources.get(controled.getResourceURL());
- if (list == null) {
- list = new LinkedList<ControledResource>();
- resources.put(controled.getResourceURL(), list);
- addAdapter(controled);
- }
- list.add(controled);
- }
-
- public void manageAllControledResources() {
- for (Resource r : modelSet.getResources()) {
- addResource(r);
- }
- }
-
- protected void addResource(Resource r) {
- if (SashModel.MODEL_FILE_EXTENSION.equals(r.getURI().fileExtension())) {
- for (EObject e : r.getContents()) {
- if (e instanceof ControledResource) {
- ControledResource root = (ControledResource) e;
- if (root != null) {
- put(root);
- for (Iterator<EObject> i = root.eAllContents(); i.hasNext();) {
- EObject eobject = i.next();
- if (eobject instanceof ControledResource) {
- put((ControledResource) eobject);
- }
- }
- }
-
- }
- }
- if (!r.eAdapters().contains(this)) {
- r.eAdapters().add(this);
- }
- }
- }
-
- public List<ControledResource> getControledResource(String locationURL) {
- List<ControledResource> list = resources.get(locationURL);
- if (list == null) {
- return Collections.emptyList();
- }
- return list;
- }
-
-
- public void notifyChanged(Notification notification) {
- Notifier aNotifier = (Notifier) notification.getNotifier();
- if (aNotifier instanceof EObject) {
- switch (notification.getEventType()) {
- case Notification.ADD:
- addControledResource(notification.getNewValue());
- break;
- case Notification.ADD_MANY:
- List<?> list = (List<?>) notification.getNewValue();
- for (Object o : list) {
- addControledResource(o);
- }
- break;
- case Notification.REMOVE:
- removeControledResource(notification.getOldValue());
- break;
- case Notification.REMOVE_MANY:
- List<?> list2 = (List<?>) notification.getOldValue();
- for (Object o : list2) {
- removeControledResource(o);
- }
- break;
- default:
- break;
- }
- } else if (aNotifier instanceof Resource) {
- switch (notification.getFeatureID(Resource.class)) {
- case Resource.RESOURCE__IS_LOADED:
- addResource((Resource) aNotifier);
- break;
- }
-
- } else if (aNotifier instanceof ModelSet) {
- if (notification.getNewValue() instanceof Resource) {
- Resource r = ((Resource) notification.getNewValue());
- if (!r.eAdapters().contains(this)) {
- r.eAdapters().add(this);
- }
- setTarget((Resource) notification.getNewValue());
- }
- }
- }
-
- protected void addControledResource(Object o) {
- if (o instanceof ControledResource) {
- ControledResource o2 = (ControledResource) o;
- put(o2);
- }
- }
-
- protected void removeControledResource(Object o) {
- if (o instanceof ControledResource) {
- ControledResource res = (ControledResource) o;
- List<ControledResource> list = resources.get(res.getResourceURL());
- if (list != null) {
- list.remove(res);
- if (list.isEmpty()) {
- resources.remove(res.getResourceURL());
- }
- }
- }
-
- }
-
- public Notifier getTarget() {
- return modelSet;
- }
-
- public boolean isAdapterForType(Object type) {
- return false;
- }
-
- /**
- * Handles installation of the adapter on an EObject by adding the adapter
- * to each of the directly contained objects.
- */
- protected void setTarget(EObject target) {
- for (@SuppressWarnings("unchecked")
- Iterator<EObject> i = (Iterator<EObject>) ((InternalEList<?>) target.eContents()).basicIterator(); i.hasNext();) {
- Notifier notifier = i.next();
- addAdapter(notifier);
- }
- }
-
- protected void addAdapter(Notifier notifier) {
- List<Adapter> eAdapters = notifier.eAdapters();
- if (!eAdapters.contains(this)) {
- eAdapters.add(this);
- }
- }
-
- /**
- * Handles installation of the adapter by adding the adapter to each of the
- * directly contained objects.
- */
- public void setTarget(Notifier target) {
- if (target instanceof EObject) {
- setTarget((EObject) target);
- } else if (target instanceof Resource) {
- setTarget((Resource) target);
- } else if (target instanceof ResourceSet) {
- setTarget((ResourceSet) target);
- }
- }
-
- /**
- * Handles installation of the adapter on a Resource by adding the adapter
- * to each of the directly contained objects.
- */
- protected void setTarget(Resource target) {
- List<EObject> contents = target.getContents();
- for (int i = 0, size = contents.size(); i < size; ++i) {
- Notifier notifier = contents.get(i);
- addAdapter(notifier);
- }
- }
-
- /**
- * Handles installation of the adapter on a ResourceSet by adding the
- * adapter to each of the directly contained objects.
- */
- protected void setTarget(ResourceSet target) {
- List<Resource> resources = target.getResources();
- for (int i = 0; i < resources.size(); ++i) {
- Notifier notifier = resources.get(i);
- addAdapter(notifier);
- }
- }
-
- /**
- * Handles undoing the installation of the adapter by removing the adapter
- * to each of the directly contained objects.
- */
- public void unsetTarget(Notifier target) {
- if (target instanceof EObject) {
- unsetTarget((EObject) target);
- } else if (target instanceof Resource) {
- unsetTarget((Resource) target);
- } else if (target instanceof ResourceSet) {
- unsetTarget((ResourceSet) target);
- }
- }
-
- /**
- * Handles undoing the installation of the adapter from an EObject by
- * removing the adapter to each of the directly contained objects.
- */
- protected void unsetTarget(EObject target) {
- for (@SuppressWarnings("unchecked")
- Iterator<InternalEObject> i = (Iterator<InternalEObject>) ((InternalEList<?>) target.eContents()).basicIterator(); i.hasNext();) {
- // Don't remove the adapter if the object is in a different resource
- // and that resource (and hence all its contents) are being cross
- // referenced.
- //
- InternalEObject internalEObject = i.next();
- Resource eDirectResource = internalEObject.eDirectResource();
- if (eDirectResource == null || !eDirectResource.eAdapters().contains(this)) {
- removeAdapter(internalEObject);
- }
- }
- }
-
- /**
- * Handles undoing the installation of the adapter from a Resource by
- * removing the adapter to each of the directly contained objects.
- */
- protected void unsetTarget(Resource target) {
- List<EObject> contents = target.getContents();
- for (int i = 0, size = contents.size(); i < size; ++i) {
- Notifier notifier = contents.get(i);
- removeAdapter(notifier);
- }
- }
-
- protected void removeAdapter(Notifier notifier) {
- notifier.eAdapters().remove(this);
- }
-
- /**
- * Handles undoing the installation of the adapter from a ResourceSet by
- * removing the adapter to each of the directly contained objects.
- */
- protected void unsetTarget(ResourceSet target) {
- List<Resource> resources = target.getResources();
- for (int i = 0; i < resources.size(); ++i) {
- Notifier notifier = resources.get(i);
- removeAdapter(notifier);
- }
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+
+/**
+ * This adapter maintains a map linking url and the corresponding ControledResource
+ *
+ * @author tfaure
+ *
+ */
+public class ControledResourceAdapter implements Adapter.Internal {
+
+ /**
+ * The map accesed
+ */
+ private Map<String, List<ControledResource>> resources = new HashMap<String, List<ControledResource>>();
+
+ private ModelSet modelSet = null;
+
+ public ControledResourceAdapter(ModelSet modelSet) {
+ this.modelSet = modelSet;
+ manageAllControledResources();
+ modelSet.eAdapters().add(this);
+ }
+
+ protected void put(ControledResource controled) {
+ List<ControledResource> list = resources.get(controled.getResourceURL());
+ if (list == null) {
+ list = new LinkedList<ControledResource>();
+ resources.put(controled.getResourceURL(), list);
+ addAdapter(controled);
+ }
+ list.add(controled);
+ }
+
+ public void manageAllControledResources() {
+ for (Resource r : modelSet.getResources()) {
+ addResource(r);
+ }
+ }
+
+ protected void addResource(Resource r) {
+ if (SashModel.MODEL_FILE_EXTENSION.equals(r.getURI().fileExtension())) {
+ for (EObject e : r.getContents()) {
+ if (e instanceof ControledResource) {
+ ControledResource root = (ControledResource) e;
+ if (root != null) {
+ put(root);
+ for (Iterator<EObject> i = root.eAllContents(); i.hasNext();) {
+ EObject eobject = i.next();
+ if (eobject instanceof ControledResource) {
+ put((ControledResource) eobject);
+ }
+ }
+ }
+
+ }
+ }
+ if (!r.eAdapters().contains(this)) {
+ r.eAdapters().add(this);
+ }
+ }
+ }
+
+ public List<ControledResource> getControledResource(String locationURL) {
+ List<ControledResource> list = resources.get(locationURL);
+ if (list == null) {
+ return Collections.emptyList();
+ }
+ return list;
+ }
+
+
+ public void notifyChanged(Notification notification) {
+ Notifier aNotifier = (Notifier) notification.getNotifier();
+ if (aNotifier instanceof EObject) {
+ switch (notification.getEventType()) {
+ case Notification.ADD:
+ addControledResource(notification.getNewValue());
+ break;
+ case Notification.ADD_MANY:
+ List<?> list = (List<?>) notification.getNewValue();
+ for (Object o : list) {
+ addControledResource(o);
+ }
+ break;
+ case Notification.REMOVE:
+ removeControledResource(notification.getOldValue());
+ break;
+ case Notification.REMOVE_MANY:
+ List<?> list2 = (List<?>) notification.getOldValue();
+ for (Object o : list2) {
+ removeControledResource(o);
+ }
+ break;
+ default:
+ break;
+ }
+ } else if (aNotifier instanceof Resource) {
+ switch (notification.getFeatureID(Resource.class)) {
+ case Resource.RESOURCE__IS_LOADED:
+ addResource((Resource) aNotifier);
+ break;
+ }
+
+ } else if (aNotifier instanceof ModelSet) {
+ if (notification.getNewValue() instanceof Resource) {
+ Resource r = ((Resource) notification.getNewValue());
+ if (!r.eAdapters().contains(this)) {
+ r.eAdapters().add(this);
+ }
+ setTarget((Resource) notification.getNewValue());
+ }
+ }
+ }
+
+ protected void addControledResource(Object o) {
+ if (o instanceof ControledResource) {
+ ControledResource o2 = (ControledResource) o;
+ put(o2);
+ }
+ }
+
+ protected void removeControledResource(Object o) {
+ if (o instanceof ControledResource) {
+ ControledResource res = (ControledResource) o;
+ List<ControledResource> list = resources.get(res.getResourceURL());
+ if (list != null) {
+ list.remove(res);
+ if (list.isEmpty()) {
+ resources.remove(res.getResourceURL());
+ }
+ }
+ }
+
+ }
+
+ public Notifier getTarget() {
+ return modelSet;
+ }
+
+ public boolean isAdapterForType(Object type) {
+ return false;
+ }
+
+ /**
+ * Handles installation of the adapter on an EObject by adding the adapter
+ * to each of the directly contained objects.
+ */
+ protected void setTarget(EObject target) {
+ for (@SuppressWarnings("unchecked")
+ Iterator<EObject> i = (Iterator<EObject>) ((InternalEList<?>) target.eContents()).basicIterator(); i.hasNext();) {
+ Notifier notifier = i.next();
+ addAdapter(notifier);
+ }
+ }
+
+ protected void addAdapter(Notifier notifier) {
+ List<Adapter> eAdapters = notifier.eAdapters();
+ if (!eAdapters.contains(this)) {
+ eAdapters.add(this);
+ }
+ }
+
+ /**
+ * Handles installation of the adapter by adding the adapter to each of the
+ * directly contained objects.
+ */
+ public void setTarget(Notifier target) {
+ if (target instanceof EObject) {
+ setTarget((EObject) target);
+ } else if (target instanceof Resource) {
+ setTarget((Resource) target);
+ } else if (target instanceof ResourceSet) {
+ setTarget((ResourceSet) target);
+ }
+ }
+
+ /**
+ * Handles installation of the adapter on a Resource by adding the adapter
+ * to each of the directly contained objects.
+ */
+ protected void setTarget(Resource target) {
+ List<EObject> contents = target.getContents();
+ for (int i = 0, size = contents.size(); i < size; ++i) {
+ Notifier notifier = contents.get(i);
+ addAdapter(notifier);
+ }
+ }
+
+ /**
+ * Handles installation of the adapter on a ResourceSet by adding the
+ * adapter to each of the directly contained objects.
+ */
+ protected void setTarget(ResourceSet target) {
+ List<Resource> resources = target.getResources();
+ for (int i = 0; i < resources.size(); ++i) {
+ Notifier notifier = resources.get(i);
+ addAdapter(notifier);
+ }
+ }
+
+ /**
+ * Handles undoing the installation of the adapter by removing the adapter
+ * to each of the directly contained objects.
+ */
+ public void unsetTarget(Notifier target) {
+ if (target instanceof EObject) {
+ unsetTarget((EObject) target);
+ } else if (target instanceof Resource) {
+ unsetTarget((Resource) target);
+ } else if (target instanceof ResourceSet) {
+ unsetTarget((ResourceSet) target);
+ }
+ }
+
+ /**
+ * Handles undoing the installation of the adapter from an EObject by
+ * removing the adapter to each of the directly contained objects.
+ */
+ protected void unsetTarget(EObject target) {
+ for (@SuppressWarnings("unchecked")
+ Iterator<InternalEObject> i = (Iterator<InternalEObject>) ((InternalEList<?>) target.eContents()).basicIterator(); i.hasNext();) {
+ // Don't remove the adapter if the object is in a different resource
+ // and that resource (and hence all its contents) are being cross
+ // referenced.
+ //
+ InternalEObject internalEObject = i.next();
+ Resource eDirectResource = internalEObject.eDirectResource();
+ if (eDirectResource == null || !eDirectResource.eAdapters().contains(this)) {
+ removeAdapter(internalEObject);
+ }
+ }
+ }
+
+ /**
+ * Handles undoing the installation of the adapter from a Resource by
+ * removing the adapter to each of the directly contained objects.
+ */
+ protected void unsetTarget(Resource target) {
+ List<EObject> contents = target.getContents();
+ for (int i = 0, size = contents.size(); i < size; ++i) {
+ Notifier notifier = contents.get(i);
+ removeAdapter(notifier);
+ }
+ }
+
+ protected void removeAdapter(Notifier notifier) {
+ notifier.eAdapters().remove(this);
+ }
+
+ /**
+ * Handles undoing the installation of the adapter from a ResourceSet by
+ * removing the adapter to each of the directly contained objects.
+ */
+ protected void unsetTarget(ResourceSet target) {
+ List<Resource> resources = target.getResources();
+ for (int i = 0; i < resources.size(); ++i) {
+ Notifier notifier = resources.get(i);
+ removeAdapter(notifier);
+ }
+ }
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java
index 1e2ebe9dbc2..fd87e05b827 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingManager.java
@@ -1,90 +1,90 @@
-/*****************************************************************************
- * Copyright (c) 2010 ATOS ORIGIN.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
-import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;
-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
-
-/**
- * This manager navigates in the history to access to controlled resources
- *
- * @author tfaure
- *
- */
-public class HistoryRoutingManager {
-
- private ControledResourceAdapter adapter;
-
- private final IProxyManager proxyManager;
-
- public HistoryRoutingManager(IProxyManager proxyManager) {
- this.proxyManager = proxyManager;
- }
-
- /**
- * Returns the eobject navigating through the history
- *
- * @param modelSet
- * @param resourceURI
- * @param fragment
- * @return
- */
- public EObject getEObject(ModelSet modelSet, String resourceURI, String fragment) {
- adapter = HistoryRoutingUtils.getControledResourceAdapter(modelSet);
- EObject result = null;
- HistoryModel historyModel = HistoryUtils.getHistoryModel(modelSet);
- if (historyModel != null) {
- List<ControledResource> res = adapter.getControledResource(resourceURI);
- if (res != null) {
- for (ControledResource controled : res) {
- for (ControledResource child : controled.getChildren()) {
- URI locationURI = URI.createURI(child.getResourceURL());
- URI toGet = locationURI.resolve(HistoryUtils.getURIFullPath(child.eResource().getURI()));
- Resource resource = modelSet.getResource(toGet, proxyManager.loadResource(locationURI));
- if (resource != null) {
- result = resource.getEObject(fragment);
- if (result != null) {
- break;
- } else {
- result = getEObject(modelSet, child.getResourceURL(), fragment);
- if (result != null) {
- break;
- }
- }
- }
- }
- }
- }
- }
- return result;
- }
-
- /**
- * Unload the routing manager dropping the ControledResourceAdapter
- */
- public void unload() {
- if (adapter != null) {
- Notifier resSet = adapter.getTarget();
- resSet.eAdapters().remove(adapter);
- adapter = null;
- }
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
+import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+
+/**
+ * This manager navigates in the history to access to controlled resources
+ *
+ * @author tfaure
+ *
+ */
+public class HistoryRoutingManager {
+
+ private ControledResourceAdapter adapter;
+
+ private final IProxyManager proxyManager;
+
+ public HistoryRoutingManager(IProxyManager proxyManager) {
+ this.proxyManager = proxyManager;
+ }
+
+ /**
+ * Returns the eobject navigating through the history
+ *
+ * @param modelSet
+ * @param resourceURI
+ * @param fragment
+ * @return
+ */
+ public EObject getEObject(ModelSet modelSet, String resourceURI, String fragment) {
+ adapter = HistoryRoutingUtils.getControledResourceAdapter(modelSet);
+ EObject result = null;
+ HistoryModel historyModel = HistoryUtils.getHistoryModel(modelSet);
+ if (historyModel != null) {
+ List<ControledResource> res = adapter.getControledResource(resourceURI);
+ if (res != null) {
+ for (ControledResource controled : res) {
+ for (ControledResource child : controled.getChildren()) {
+ URI locationURI = URI.createURI(child.getResourceURL());
+ URI toGet = locationURI.resolve(HistoryUtils.getURIFullPath(child.eResource().getURI()));
+ Resource resource = modelSet.getResource(toGet, proxyManager.loadResource(locationURI));
+ if (resource != null) {
+ result = resource.getEObject(fragment);
+ if (result != null) {
+ break;
+ } else {
+ result = getEObject(modelSet, child.getResourceURL(), fragment);
+ if (result != null) {
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Unload the routing manager dropping the ControledResourceAdapter
+ */
+ public void unload() {
+ if (adapter != null) {
+ Notifier resSet = adapter.getTarget();
+ resSet.eAdapters().remove(adapter);
+ adapter = null;
+ }
+ }
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java
index 4e2702f9e62..c9722e453cd 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/HistoryRoutingUtils.java
@@ -1,79 +1,79 @@
-/*****************************************************************************
- * Copyright (c) 2010 ATOS ORIGIN.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;
-import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
-import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;
-import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
-
-
-/**
- * The Class HistoryRoutingUtils.
- */
-public class HistoryRoutingUtils {
-
- /**
- * Retrieves all the URIs of the controlled resources of the initial resource uri
- *
- * @param model
- * , the history model
- * @param initialURI
- * , the uri to check
- * @return
- */
- public static Set<String> getAllControledURIs(ModelSet set, HistoryModel model, URI initialURI, boolean loadCorrespondantDI) {
- Set<String> result = new HashSet<String>();
- String path = HistoryUtils.getURIFullPath(SashModelUtils.getInitialURI(set)).toString();
- if (model != null && initialURI != null) {
- ControledResourceAdapter adapter = getControledResourceAdapter(set);
- set.getResource(URI.createURI(path.concat(initialURI.trimFragment().trimFileExtension().appendFileExtension(SashModel.MODEL_FILE_EXTENSION).toString())), loadCorrespondantDI);
- List<ControledResource> elements = adapter.getControledResource(initialURI.toString());
- for (ControledResource c : elements) {
- for (ControledResource child : c.getChildren()) {
- URI childURI = URI.createURI(child.getResourceURL());
- result.add(childURI.toString());
- result.addAll(getAllControledURIs(set, model, childURI, loadCorrespondantDI));
- }
- }
- }
- return result;
- }
-
- /**
- * get the controled resource adapter from the given {@link ModelSet} if it is not found it is installed
- *
- * @param set
- * @return
- */
- public static ControledResourceAdapter getControledResourceAdapter(ModelSet set) {
- ControledResourceAdapter adapter = null;
- for (Adapter a : set.eAdapters()) {
- if (a instanceof ControledResourceAdapter) {
- adapter = (ControledResourceAdapter) a;
- }
- }
- if (adapter == null) {
- adapter = new ControledResourceAdapter(set);
- }
- return adapter;
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;
+import org.eclipse.papyrus.infra.services.controlmode.history.HistoryModel;
+import org.eclipse.papyrus.infra.services.controlmode.history.utils.HistoryUtils;
+import org.eclipse.papyrus.infra.services.controlmode.mm.history.ControledResource;
+
+
+/**
+ * The Class HistoryRoutingUtils.
+ */
+public class HistoryRoutingUtils {
+
+ /**
+ * Retrieves all the URIs of the controlled resources of the initial resource uri
+ *
+ * @param model
+ * , the history model
+ * @param initialURI
+ * , the uri to check
+ * @return
+ */
+ public static Set<String> getAllControledURIs(ModelSet set, HistoryModel model, URI initialURI, boolean loadCorrespondantDI) {
+ Set<String> result = new HashSet<String>();
+ String path = HistoryUtils.getURIFullPath(SashModelUtils.getInitialURI(set)).toString();
+ if (model != null && initialURI != null) {
+ ControledResourceAdapter adapter = getControledResourceAdapter(set);
+ set.getResource(URI.createURI(path.concat(initialURI.trimFragment().trimFileExtension().appendFileExtension(SashModel.MODEL_FILE_EXTENSION).toString())), loadCorrespondantDI);
+ List<ControledResource> elements = adapter.getControledResource(initialURI.toString());
+ for (ControledResource c : elements) {
+ for (ControledResource child : c.getChildren()) {
+ URI childURI = URI.createURI(child.getResourceURL());
+ result.add(childURI.toString());
+ result.addAll(getAllControledURIs(set, model, childURI, loadCorrespondantDI));
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * get the controled resource adapter from the given {@link ModelSet} if it is not found it is installed
+ *
+ * @param set
+ * @return
+ */
+ public static ControledResourceAdapter getControledResourceAdapter(ModelSet set) {
+ ControledResourceAdapter adapter = null;
+ for (Adapter a : set.eAdapters()) {
+ if (a instanceof ControledResourceAdapter) {
+ adapter = (ControledResourceAdapter) a;
+ }
+ }
+ if (adapter == null) {
+ adapter = new ControledResourceAdapter(set);
+ }
+ return adapter;
+ }
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java
index 8c452259b0f..8be8f47876a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategy.java
@@ -1,42 +1,42 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-
-/**
- * The Interface ILoadingStrategy that manages several strategies to load the model
- */
-public interface ILoadingStrategy {
-
- /**
- * Check if the resource from the uri need to be loaded according to the strategy.
- *
- * @param modelSet
- * @param uri
- * @return true if resource must be loaded, return false otherwise
- */
- boolean loadResource(ModelSet modelSet, URI uri);
-
- // AR : additional resources (types, profiles ...)
- // parents : set of elements containing the current selection
- // currents : the resource opened
- // children : the resources bellow the current selection
-
- // strategy 1: all : AR U parents U currents U children -> done
- // strategy 2: only one : AR U currents -> done
- // strategy 3: bellow : AR U children U currents
- // strategy 4: ask the user the needed resources he wants to load (need an UI)
-}
+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * The Interface ILoadingStrategy that manages several strategies to load the model
+ */
+public interface ILoadingStrategy {
+
+ /**
+ * Check if the resource from the uri need to be loaded according to the strategy.
+ *
+ * @param modelSet
+ * @param uri
+ * @return true if resource must be loaded, return false otherwise
+ */
+ boolean loadResource(ModelSet modelSet, URI uri);
+
+ // AR : additional resources (types, profiles ...)
+ // parents : set of elements containing the current selection
+ // currents : the resource opened
+ // children : the resources bellow the current selection
+
+ // strategy 1: all : AR U parents U currents U children -> done
+ // strategy 2: only one : AR U currents -> done
+ // strategy 3: bellow : AR U children U currents
+ // strategy 4: ask the user the needed resources he wants to load (need an UI)
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java
index fb3469a3b6b..70ce3ec9b48 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/ILoadingStrategyExtension.java
@@ -1,34 +1,34 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-
-/**
- * The Interface ILoadingStrategyExtension.
- */
-public interface ILoadingStrategyExtension {
-
- /**
- * Check if the resource from the uri need to be loaded, no matter which strategy is set.
- *
- * @param modelSet
- * the model set
- * @param uri
- * the uri of the eObject
- * @return true if resource must be loaded irrespective of strategy, return false otherwise
- */
- boolean loadResource(ModelSet modelSet, URI uri);
-}
+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+/**
+ * The Interface ILoadingStrategyExtension.
+ */
+public interface ILoadingStrategyExtension {
+
+ /**
+ * Check if the resource from the uri need to be loaded, no matter which strategy is set.
+ *
+ * @param modelSet
+ * the model set
+ * @param uri
+ * the uri of the eObject
+ * @return true if resource must be loaded irrespective of strategy, return false otherwise
+ */
+ boolean loadResource(ModelSet modelSet, URI uri);
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java
index ea93a77cda7..e955a2561e9 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/IProxyManager.java
@@ -1,47 +1,47 @@
-/*****************************************************************************
- * Copyright (c) 2010 ATOS ORIGIN.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * Interface providing services to load resources and resolves Proxies
- *
- * @author tfaure
- *
- */
-public interface IProxyManager {
-
- /**
- * Release the different resources to free memory
- */
- void dispose();
-
- /**
- * Returns an eobject from a strategy, the implementation manages itself its resources
- *
- * @param uri
- * @return
- */
- EObject getEObjectFromStrategy(URI uri);
-
- /**
- * Returns true if the proxy manager will load the resource located at the URI
- *
- * @param uri
- * @return
- */
- boolean loadResource(URI uri);
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010 ATOS ORIGIN.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Tristan Faure (ATOS ORIGIN INTEGRATION) tristan.faure@atosorigin.com - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+
+
+/**
+ * Interface providing services to load resources and resolves Proxies
+ *
+ * @author tfaure
+ *
+ */
+public interface IProxyManager {
+
+ /**
+ * Release the different resources to free memory
+ */
+ void dispose();
+
+ /**
+ * Returns an eobject from a strategy, the implementation manages itself its resources
+ *
+ * @param uri
+ * @return
+ */
+ EObject getEObjectFromStrategy(URI uri);
+
+ /**
+ * Returns true if the proxy manager will load the resource located at the URI
+ *
+ * @param uri
+ * @return
+ */
+ boolean loadResource(URI uri);
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java
index 8788e44d11a..501db97030e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/Messages.java
@@ -1,48 +1,48 @@
-/*****************************************************************************
- * Copyright (c) 2011 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This class handles messages internationalization
- *
- * @author vhemery
- */
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.resourceloading.messages"; //$NON-NLS-1$
-
- /** Error message */
- public static String LoadingUtils_ErrorMessage;
-
- /** Error popup title */
- public static String LoadingUtils_ErrorTitle;
-
- /** Load models task name */
- public static String LoadingUtils_LoadModelsTask;
-
- /** Resfresh pages task name */
- public static String LoadingUtils_RefreshPagesTask;
-
- /** Unload models task name */
- public static String LoadingUtils_UnloadModelsTask;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2011 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * This class handles messages internationalization
+ *
+ * @author vhemery
+ */
+public class Messages extends NLS {
+
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.resourceloading.messages"; //$NON-NLS-1$
+
+ /** Error message */
+ public static String LoadingUtils_ErrorMessage;
+
+ /** Error popup title */
+ public static String LoadingUtils_ErrorTitle;
+
+ /** Load models task name */
+ public static String LoadingUtils_LoadModelsTask;
+
+ /** Resfresh pages task name */
+ public static String LoadingUtils_RefreshPagesTask;
+
+ /** Unload models task name */
+ public static String LoadingUtils_UnloadModelsTask;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java
index 80c739f901c..d0e833dbf5a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/OnDemandLoadingModelSetServiceFactory.java
@@ -1,35 +1,35 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2014 LIFL, CEA, and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading;
-
-import org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-
-
-/**
- * A service starting the ModelSet
- *
- * @author cedric dumoulin
- *
- */
-public class OnDemandLoadingModelSetServiceFactory extends ModelSetServiceFactory {
-
- @Override
- protected ModelSet createModelSet() {
- // Create the appropriate service.
- return new OnDemandLoadingModelSet();
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2011, 2014 LIFL, CEA, and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 431953 (pre-requisite refactoring of ModelSet service start-up)
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading;
+
+import org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+
+
+/**
+ * A service starting the ModelSet
+ *
+ * @author cedric dumoulin
+ *
+ */
+public class OnDemandLoadingModelSetServiceFactory extends ModelSetServiceFactory {
+
+ @Override
+ protected ModelSet createModelSet() {
+ // Create the appropriate service.
+ return new OnDemandLoadingModelSet();
+ }
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java
index 08f0695dac3..6c3c7ff9c0f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/impl/ProxyManager.java
@@ -1,286 +1,286 @@
-/*****************************************************************************
- * Copyright (c) 2010, 2014 Atos Origin, CEA, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
- * Christian W. Damus (CEA) - bug 437217
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading.impl;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
-import org.eclipse.papyrus.infra.services.resourceloading.Activator;
-import org.eclipse.papyrus.infra.services.resourceloading.HistoryRoutingManager;
-import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
-import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension;
-import org.eclipse.papyrus.infra.services.resourceloading.IProxyManager;
-import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;
-
-/**
- * The Class ProxyManager that manages the proxy resolving according to a specific strategy.
- */
-public class ProxyManager implements IProxyManager {
-
- // === Manage strategies
-
- /** extension point ID for loading strategy */
- private static final String LOADING_STRATEGY_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.loadingStrategy";
-
- /** element ID for the loading strategy element */
- private static final String LOADING_STRATEGY_ELEMENT_ID = "loadingStrategy";
-
- /** attribute ID for identification of the strategy */
- private static final String LOADING_STRATEGY_ID = "id";
-
- /** attribute ID for the description of the strategy */
- private static final String LOADING_STRATEGY_DESCRIPTION_ID = "description";
-
- /** attribute ID for the implementation of the strategy */
- private static final String STRATEGY_ID = "strategy";
-
- // ==== Manage strategy extensions (for UML profile)
-
- /** extension point ID for strategy extensions */
- private static final String STRATEGY_EXTENDER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.loadingStrategyExtender";
-
- /** element ID for the loading strategy extension element */
- private static final String STRATEGY_EXTENDER_ELEMENT_ID = "strategyExtender";
-
- /** attribute ID for the implementation of the strategy extension */
- private static final String STRATEGY_EXTENSION_ID = "strategyExtension";
-
- // === Manage strategy chooser extension
-
- /** extension point ID for strategy chooser extension */
- private static final String STRATEGY_CHOOSER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.currentStrategyChooser";
-
- /** attribute ID for the implementation of the strategy chooser extension used in preferences */
- private static final String STRATEGY_CHOOSER_CHOOSER_ATTRIBUTE = "chooser";
-
- private static IStrategyChooser strategyChooser = getStrategyChooser();
-
- // ===
-
- /** The strategies id and descriptions for preferences */
- private static Map<Integer, String> strategiesAndDescriptions = new HashMap<Integer, String>();
-
- /** custom commands from extensions */
- private static Map<Integer, ILoadingStrategy> availableStrategies = getLoadingStrategies();
-
- /** custom commands from strategy extensions */
- private static Set<ILoadingStrategyExtension> strategyExtensions = getLoadingStrategyExtensions();
-
- private ModelSet modelSet;
-
- private HistoryRoutingManager routeManager = new HistoryRoutingManager(this);
-
- public ProxyManager(ModelSet modelSet) {
- super();
- this.modelSet = modelSet;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.papyrus.infra.services.resourceloading.IProxyManager#loadResource(URI)
- */
- public boolean loadResource(URI uri) {
- boolean result = availableStrategies.get(getCurrentStrategy()).loadResource(modelSet, uri);
- Iterator<ILoadingStrategyExtension> iterator = strategyExtensions.iterator();
- while (!result && iterator.hasNext()) {
- ILoadingStrategyExtension extension = iterator.next();
- result = extension.loadResource(modelSet, uri.trimFragment());
- }
- return result;
- }
-
- /**
- * Gets the eobject according to the strategy.
- *
- * @param uri
- * the specified uri to load
- * @return the resolved eobject or the proxy, depending on the loading strategy
- * @throws MissingResourceException
- * the missing resource exception
- */
- public EObject getEObjectFromStrategy(URI uri) throws MissingResourceException {
- // ask the strategy if the resource of the uri must be loaded
- URI trimFragment = uri.trimFragment();
- boolean loadOnDemand = loadResource(trimFragment);
- // accept to recover object, either if strategy provides it, or if it has already been loaded anyway
- Resource resource = modelSet.getResource(trimFragment, loadOnDemand);
- if (resource != null) {
- String fragment = uri.fragment();
- EObject object = resource.getEObject(fragment);
- if (object != null) {
- // object find in the resource
- return object;
- }
- // use HistoryRoutingManager to explore routes in di resource history
- else {
- String fileExtension = uri.fileExtension();
- Resource diResource = null;
- String resourceName = "";
- if (DiModel.MODEL_FILE_EXTENSION.equals(fileExtension)) {
- // proxy is in DI resource
- diResource = modelSet.getResource(trimFragment, loadOnDemand);
- resourceName = trimFragment.toString();
- } else {
- // retrieve the DI resource from the uri to get the history
- URI newURI = trimFragment.trimFileExtension().appendFileExtension(DiModel.MODEL_FILE_EXTENSION);
- try {
- diResource = modelSet.getResource(newURI.trimFragment(), loadOnDemand);
- } catch (WrappedException e) {
- // capture wrapped exception here, see Bug 405047 - [core] FileNotFoundException during MARTE profile load
- throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { resourceName }), getClass().getName(), resourceName);
- }
- resourceName = newURI.trimFragment().toString();
- }
- if (diResource != null) {
- // call the HistoryRoutingManager to get the EObject
- // we assume di/notation are at the same level in folder hierarchy
- EObject eobject = routeManager.getEObject(modelSet, uri.lastSegment().toString(), fragment);
- return eobject;
- } else {
- // resource di not found
- // warn the user, ask him to select the resource
- throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { resourceName }), getClass().getName(), resourceName);
- }
- }
- } else if (loadOnDemand) {
- // resource not found
- // warn the user, ask him to select a resource to search in
- // or ask to search in the entire resource set
- // or use a proxy
- // strategy used for the specified resource only
- throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { trimFragment.toString() }), getClass().getName(), trimFragment.toString());
- } else {
- // we just want to manage a proxy for this object
- return null;
- }
- }
-
- /**
- * Gets the current strategy.
- *
- * @return the current strategy, strategy 0 (load all resources) is loaded by default if null
- */
- private static int getCurrentStrategy() {
- if (strategyChooser == null) {
- return 0;
- }
- return strategyChooser.getCurrentStrategy();
- }
-
- /**
- * Gets the all strategies.
- *
- * @return the all strategies
- */
- public static Map<Integer, String> getAllStrategies() {
- return strategiesAndDescriptions;
- }
-
- /**
- * Gets the available strategies from extensions
- *
- * @return the strategies
- */
- private static Map<Integer, ILoadingStrategy> getLoadingStrategies() {
- Map<Integer, ILoadingStrategy> strategies = new HashMap<Integer, ILoadingStrategy>();
- IConfigurationElement[] extensions = Platform.getExtensionRegistry().getConfigurationElementsFor(LOADING_STRATEGY_EXTENSION_POINT_ID);
- for (IConfigurationElement element : extensions) {
- if (LOADING_STRATEGY_ELEMENT_ID.equals(element.getName())) {
- try {
- // use description in extension to define preferences from the extensions
- int id = Integer.valueOf(element.getAttribute(LOADING_STRATEGY_ID));
- String description = element.getAttribute(LOADING_STRATEGY_DESCRIPTION_ID);
- ILoadingStrategy strategy = (ILoadingStrategy) element.createExecutableExtension(STRATEGY_ID);
- strategies.put(id, strategy);
- strategiesAndDescriptions.put(id, description);
- } catch (CoreException e1) {
- Activator.log.error(e1.getMessage(), e1);
- e1.printStackTrace();
- } catch (NumberFormatException e2) {
- Activator.log.error(e2.getMessage(), e2);
- e2.printStackTrace();
- }
- }
- }
- return strategies;
- }
-
- /**
- * Gets the strategy extensions
- *
- * @return the strategy extensions
- */
- private static Set<ILoadingStrategyExtension> getLoadingStrategyExtensions() {
- Set<ILoadingStrategyExtension> strategies = new HashSet<ILoadingStrategyExtension>();
- IConfigurationElement[] extensions = Platform.getExtensionRegistry().getConfigurationElementsFor(STRATEGY_EXTENDER_EXTENSION_POINT_ID);
- for (IConfigurationElement element : extensions) {
- if (STRATEGY_EXTENDER_ELEMENT_ID.equals(element.getName())) {
- try {
- ILoadingStrategyExtension strategyExtension = (ILoadingStrategyExtension) element.createExecutableExtension(STRATEGY_EXTENSION_ID);
- strategies.add(strategyExtension);
- } catch (CoreException e) {
- Activator.log.error(e.getMessage(), e);
- e.printStackTrace();
- }
- }
- }
- return strategies;
- }
-
- /**
- * There is only one Strategy chooser chosen in extension registry.
- *
- * @return
- */
- public static IStrategyChooser getStrategyChooser() {
- IStrategyChooser result = null;
- IConfigurationElement[] element = Platform.getExtensionRegistry().getConfigurationElementsFor(STRATEGY_CHOOSER_EXTENSION_POINT_ID);
- if (element.length > 0) {
- IConfigurationElement e = element[0];
- try {
- result = (IStrategyChooser) e.createExecutableExtension(STRATEGY_CHOOSER_CHOOSER_ATTRIBUTE);
- } catch (CoreException e1) {
- Activator.log.error(e1.getMessage(), e1);
- e1.printStackTrace();
- }
- }
- return result;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.papyrus.infra.services.resourceloading.IProxyManager#dispose()
- */
- public void dispose() {
- routeManager.unload();
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010, 2014 Atos Origin, CEA, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 437217
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.impl;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.CommonPlugin;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.services.resourceloading.Activator;
+import org.eclipse.papyrus.infra.services.resourceloading.HistoryRoutingManager;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategyExtension;
+import org.eclipse.papyrus.infra.services.resourceloading.IProxyManager;
+import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;
+
+/**
+ * The Class ProxyManager that manages the proxy resolving according to a specific strategy.
+ */
+public class ProxyManager implements IProxyManager {
+
+ // === Manage strategies
+
+ /** extension point ID for loading strategy */
+ private static final String LOADING_STRATEGY_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.loadingStrategy";
+
+ /** element ID for the loading strategy element */
+ private static final String LOADING_STRATEGY_ELEMENT_ID = "loadingStrategy";
+
+ /** attribute ID for identification of the strategy */
+ private static final String LOADING_STRATEGY_ID = "id";
+
+ /** attribute ID for the description of the strategy */
+ private static final String LOADING_STRATEGY_DESCRIPTION_ID = "description";
+
+ /** attribute ID for the implementation of the strategy */
+ private static final String STRATEGY_ID = "strategy";
+
+ // ==== Manage strategy extensions (for UML profile)
+
+ /** extension point ID for strategy extensions */
+ private static final String STRATEGY_EXTENDER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.loadingStrategyExtender";
+
+ /** element ID for the loading strategy extension element */
+ private static final String STRATEGY_EXTENDER_ELEMENT_ID = "strategyExtender";
+
+ /** attribute ID for the implementation of the strategy extension */
+ private static final String STRATEGY_EXTENSION_ID = "strategyExtension";
+
+ // === Manage strategy chooser extension
+
+ /** extension point ID for strategy chooser extension */
+ private static final String STRATEGY_CHOOSER_EXTENSION_POINT_ID = "org.eclipse.papyrus.infra.services.resourceloading.currentStrategyChooser";
+
+ /** attribute ID for the implementation of the strategy chooser extension used in preferences */
+ private static final String STRATEGY_CHOOSER_CHOOSER_ATTRIBUTE = "chooser";
+
+ private static IStrategyChooser strategyChooser = getStrategyChooser();
+
+ // ===
+
+ /** The strategies id and descriptions for preferences */
+ private static Map<Integer, String> strategiesAndDescriptions = new HashMap<Integer, String>();
+
+ /** custom commands from extensions */
+ private static Map<Integer, ILoadingStrategy> availableStrategies = getLoadingStrategies();
+
+ /** custom commands from strategy extensions */
+ private static Set<ILoadingStrategyExtension> strategyExtensions = getLoadingStrategyExtensions();
+
+ private ModelSet modelSet;
+
+ private HistoryRoutingManager routeManager = new HistoryRoutingManager(this);
+
+ public ProxyManager(ModelSet modelSet) {
+ super();
+ this.modelSet = modelSet;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.papyrus.infra.services.resourceloading.IProxyManager#loadResource(URI)
+ */
+ public boolean loadResource(URI uri) {
+ boolean result = availableStrategies.get(getCurrentStrategy()).loadResource(modelSet, uri);
+ Iterator<ILoadingStrategyExtension> iterator = strategyExtensions.iterator();
+ while (!result && iterator.hasNext()) {
+ ILoadingStrategyExtension extension = iterator.next();
+ result = extension.loadResource(modelSet, uri.trimFragment());
+ }
+ return result;
+ }
+
+ /**
+ * Gets the eobject according to the strategy.
+ *
+ * @param uri
+ * the specified uri to load
+ * @return the resolved eobject or the proxy, depending on the loading strategy
+ * @throws MissingResourceException
+ * the missing resource exception
+ */
+ public EObject getEObjectFromStrategy(URI uri) throws MissingResourceException {
+ // ask the strategy if the resource of the uri must be loaded
+ URI trimFragment = uri.trimFragment();
+ boolean loadOnDemand = loadResource(trimFragment);
+ // accept to recover object, either if strategy provides it, or if it has already been loaded anyway
+ Resource resource = modelSet.getResource(trimFragment, loadOnDemand);
+ if (resource != null) {
+ String fragment = uri.fragment();
+ EObject object = resource.getEObject(fragment);
+ if (object != null) {
+ // object find in the resource
+ return object;
+ }
+ // use HistoryRoutingManager to explore routes in di resource history
+ else {
+ String fileExtension = uri.fileExtension();
+ Resource diResource = null;
+ String resourceName = "";
+ if (DiModel.MODEL_FILE_EXTENSION.equals(fileExtension)) {
+ // proxy is in DI resource
+ diResource = modelSet.getResource(trimFragment, loadOnDemand);
+ resourceName = trimFragment.toString();
+ } else {
+ // retrieve the DI resource from the uri to get the history
+ URI newURI = trimFragment.trimFileExtension().appendFileExtension(DiModel.MODEL_FILE_EXTENSION);
+ try {
+ diResource = modelSet.getResource(newURI.trimFragment(), loadOnDemand);
+ } catch (WrappedException e) {
+ // capture wrapped exception here, see Bug 405047 - [core] FileNotFoundException during MARTE profile load
+ throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { resourceName }), getClass().getName(), resourceName);
+ }
+ resourceName = newURI.trimFragment().toString();
+ }
+ if (diResource != null) {
+ // call the HistoryRoutingManager to get the EObject
+ // we assume di/notation are at the same level in folder hierarchy
+ EObject eobject = routeManager.getEObject(modelSet, uri.lastSegment().toString(), fragment);
+ return eobject;
+ } else {
+ // resource di not found
+ // warn the user, ask him to select the resource
+ throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { resourceName }), getClass().getName(), resourceName);
+ }
+ }
+ } else if (loadOnDemand) {
+ // resource not found
+ // warn the user, ask him to select a resource to search in
+ // or ask to search in the entire resource set
+ // or use a proxy
+ // strategy used for the specified resource only
+ throw new MissingResourceException(CommonPlugin.INSTANCE.getString("_UI_StringResourceNotFound_exception", new Object[] { trimFragment.toString() }), getClass().getName(), trimFragment.toString());
+ } else {
+ // we just want to manage a proxy for this object
+ return null;
+ }
+ }
+
+ /**
+ * Gets the current strategy.
+ *
+ * @return the current strategy, strategy 0 (load all resources) is loaded by default if null
+ */
+ private static int getCurrentStrategy() {
+ if (strategyChooser == null) {
+ return 0;
+ }
+ return strategyChooser.getCurrentStrategy();
+ }
+
+ /**
+ * Gets the all strategies.
+ *
+ * @return the all strategies
+ */
+ public static Map<Integer, String> getAllStrategies() {
+ return strategiesAndDescriptions;
+ }
+
+ /**
+ * Gets the available strategies from extensions
+ *
+ * @return the strategies
+ */
+ private static Map<Integer, ILoadingStrategy> getLoadingStrategies() {
+ Map<Integer, ILoadingStrategy> strategies = new HashMap<Integer, ILoadingStrategy>();
+ IConfigurationElement[] extensions = Platform.getExtensionRegistry().getConfigurationElementsFor(LOADING_STRATEGY_EXTENSION_POINT_ID);
+ for (IConfigurationElement element : extensions) {
+ if (LOADING_STRATEGY_ELEMENT_ID.equals(element.getName())) {
+ try {
+ // use description in extension to define preferences from the extensions
+ int id = Integer.valueOf(element.getAttribute(LOADING_STRATEGY_ID));
+ String description = element.getAttribute(LOADING_STRATEGY_DESCRIPTION_ID);
+ ILoadingStrategy strategy = (ILoadingStrategy) element.createExecutableExtension(STRATEGY_ID);
+ strategies.put(id, strategy);
+ strategiesAndDescriptions.put(id, description);
+ } catch (CoreException e1) {
+ Activator.log.error(e1.getMessage(), e1);
+ e1.printStackTrace();
+ } catch (NumberFormatException e2) {
+ Activator.log.error(e2.getMessage(), e2);
+ e2.printStackTrace();
+ }
+ }
+ }
+ return strategies;
+ }
+
+ /**
+ * Gets the strategy extensions
+ *
+ * @return the strategy extensions
+ */
+ private static Set<ILoadingStrategyExtension> getLoadingStrategyExtensions() {
+ Set<ILoadingStrategyExtension> strategies = new HashSet<ILoadingStrategyExtension>();
+ IConfigurationElement[] extensions = Platform.getExtensionRegistry().getConfigurationElementsFor(STRATEGY_EXTENDER_EXTENSION_POINT_ID);
+ for (IConfigurationElement element : extensions) {
+ if (STRATEGY_EXTENDER_ELEMENT_ID.equals(element.getName())) {
+ try {
+ ILoadingStrategyExtension strategyExtension = (ILoadingStrategyExtension) element.createExecutableExtension(STRATEGY_EXTENSION_ID);
+ strategies.add(strategyExtension);
+ } catch (CoreException e) {
+ Activator.log.error(e.getMessage(), e);
+ e.printStackTrace();
+ }
+ }
+ }
+ return strategies;
+ }
+
+ /**
+ * There is only one Strategy chooser chosen in extension registry.
+ *
+ * @return
+ */
+ public static IStrategyChooser getStrategyChooser() {
+ IStrategyChooser result = null;
+ IConfigurationElement[] element = Platform.getExtensionRegistry().getConfigurationElementsFor(STRATEGY_CHOOSER_EXTENSION_POINT_ID);
+ if (element.length > 0) {
+ IConfigurationElement e = element[0];
+ try {
+ result = (IStrategyChooser) e.createExecutableExtension(STRATEGY_CHOOSER_CHOOSER_ATTRIBUTE);
+ } catch (CoreException e1) {
+ Activator.log.error(e1.getMessage(), e1);
+ e1.printStackTrace();
+ }
+ }
+ return result;
+ }
+
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.papyrus.infra.services.resourceloading.IProxyManager#dispose()
+ */
+ public void dispose() {
+ routeManager.unload();
+ }
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
index f22195b08d8..d959edb3970 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/messages.properties
@@ -1,18 +1,18 @@
-##########################################################################################
-# Copyright (c) 2011 Atos.
-#
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
-#
-########################################################################################
-LoadingUtils_ErrorMessage=Unable to load resource %s
-LoadingUtils_ErrorTitle=Error
-LoadingUtils_LoadModelsTask=Load models
-LoadingUtils_RefreshPagesTask=Refresh Pages
-LoadingUtils_UnloadModelsTask=Unload models
+##########################################################################################
+# Copyright (c) 2011 Atos.
+#
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Vincent Hemery (Atos) vincent.hemery@atos.net - Initial API and implementation
+#
+########################################################################################
+LoadingUtils_ErrorMessage=Unable to load resource %s
+LoadingUtils_ErrorTitle=Error
+LoadingUtils_LoadModelsTask=Load models
+LoadingUtils_RefreshPagesTask=Refresh Pages
+LoadingUtils_UnloadModelsTask=Unload models
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java
index 3e2c3653806..a93b617c43f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/LoadAllResources.java
@@ -1,34 +1,34 @@
-/*****************************************************************************
- * Copyright (c) 2010 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.services.resourceloading.strategies;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
-
-
-/**
- * Default strategy that load all the resources
- */
-public class LoadAllResources implements ILoadingStrategy {
-
- /**
- * {@inheritDoc}
- */
- public boolean loadResource(ModelSet modelSet, URI uri) {
- // whatever is the uri, the resource is loaded
- return true;
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010 Atos Origin.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.resourceloading.strategies;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.services.resourceloading.ILoadingStrategy;
+
+
+/**
+ * Default strategy that load all the resources
+ */
+public class LoadAllResources implements ILoadingStrategy {
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean loadResource(ModelSet modelSet, URI uri) {
+ // whatever is the uri, the resource is loaded
+ return true;
+ }
+
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java
index f67582807da..1f6c18be703 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/Messages.java
@@ -1,41 +1,41 @@
-package org.eclipse.papyrus.infra.services.resourceloading.strategies;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.resourceloading.strategies.messages"; //$NON-NLS-1$
-
- public static String AskUserStrategy_0;
-
- public static String AskUserStrategy_12;
-
- public static String AskUserStrategy_ERROR;
-
- public static String AskUserStrategy_LOAD_RESOURCE;
-
- public static String AskUserStrategy_MESSAGE_PART_1;
-
- public static String AskUserStrategy_MESSAGE_PART_2;
-
- public static String AskUserStrategy_MESSAGE_PART3;
-
- public static String AskUserStrategy_NO;
-
- public static String AskUserStrategy_NO_FOR_ALL;
-
- public static String AskUserStrategy_NO_FOR_ALL_URI;
-
- public static String AskUserStrategy_UNABLE_TO_LOAD;
-
- public static String AskUserStrategy_YES;
-
- public static String AskUserStrategy_YES_FOR_ALL_URI;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
+package org.eclipse.papyrus.infra.services.resourceloading.strategies;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+
+ private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.resourceloading.strategies.messages"; //$NON-NLS-1$
+
+ public static String AskUserStrategy_0;
+
+ public static String AskUserStrategy_12;
+
+ public static String AskUserStrategy_ERROR;
+
+ public static String AskUserStrategy_LOAD_RESOURCE;
+
+ public static String AskUserStrategy_MESSAGE_PART_1;
+
+ public static String AskUserStrategy_MESSAGE_PART_2;
+
+ public static String AskUserStrategy_MESSAGE_PART3;
+
+ public static String AskUserStrategy_NO;
+
+ public static String AskUserStrategy_NO_FOR_ALL;
+
+ public static String AskUserStrategy_NO_FOR_ALL_URI;
+
+ public static String AskUserStrategy_UNABLE_TO_LOAD;
+
+ public static String AskUserStrategy_YES;
+
+ public static String AskUserStrategy_YES_FOR_ALL_URI;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties
index 0d70f650ff3..44f57406344 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/infra/services/resourceloading/strategies/messages.properties
@@ -1,13 +1,13 @@
-AskUserStrategy_0=Yes for all
-AskUserStrategy_12=
-AskUserStrategy_ERROR=Error
-AskUserStrategy_LOAD_RESOURCE=Load resource
-AskUserStrategy_MESSAGE_PART_1=<form><p>The editor opening the file
-AskUserStrategy_MESSAGE_PART_2=\ is trying to open an external resource:</p><p>
-AskUserStrategy_MESSAGE_PART3=</p><p>Do you want to load it ?</p></form>
-AskUserStrategy_NO=No
-AskUserStrategy_NO_FOR_ALL=No for all
-AskUserStrategy_NO_FOR_ALL_URI=papyrus://NoForAll
-AskUserStrategy_UNABLE_TO_LOAD=Unable to load resource %s
-AskUserStrategy_YES=Yes
-AskUserStrategy_YES_FOR_ALL_URI=papyrus://YesForAll
+AskUserStrategy_0=Yes for all
+AskUserStrategy_12=
+AskUserStrategy_ERROR=Error
+AskUserStrategy_LOAD_RESOURCE=Load resource
+AskUserStrategy_MESSAGE_PART_1=<form><p>The editor opening the file
+AskUserStrategy_MESSAGE_PART_2=\ is trying to open an external resource:</p><p>
+AskUserStrategy_MESSAGE_PART3=</p><p>Do you want to load it ?</p></form>
+AskUserStrategy_NO=No
+AskUserStrategy_NO_FOR_ALL=No for all
+AskUserStrategy_NO_FOR_ALL_URI=papyrus://NoForAll
+AskUserStrategy_UNABLE_TO_LOAD=Unable to load resource %s
+AskUserStrategy_YES=Yes
+AskUserStrategy_YES_FOR_ALL_URI=papyrus://YesForAll

Back to the top