From 0110fcd01a50e94530f55c3f2a00488677279da9 Mon Sep 17 00:00:00 2001 From: Soeren Domroes Date: Mon, 8 Jun 2020 13:03:25 +0200 Subject: [PATCH 1/5] Moved not UI dependent parts to Ide bundle. Signed-off-by: Soeren Domroes --- .../de.cau.cs.kieler.klighd.ide/.checkstyle | 10 + .../de.cau.cs.kieler.klighd.ide/.classpath | 8 + plugins/de.cau.cs.kieler.klighd.ide/.project | 40 +++ .../.settings/org.eclipse.jdt.core.prefs | 286 ++++++++++++++++++ .../.settings/org.eclipse.jdt.ui.prefs | 5 + .../META-INF/MANIFEST.MF | 17 ++ .../de.cau.cs.kieler.klighd.ide/about.html | 30 ++ .../build.properties | 7 + .../de.cau.cs.kieler.klighd.ide/plugin.xml | 15 + plugins/de.cau.cs.kieler.klighd.ide/pom.xml | 37 +++ .../klighd/ide}/model/MessageModel.java | 2 +- .../syntheses/EObjectFallbackSynthesis.xtend | 4 +- .../syntheses/MessageModelSynthesis.xtend | 4 +- .../action/EcoreModelExpandDetailsAction.java | 4 +- .../META-INF/MANIFEST.MF | 3 +- .../plugin.xml | 8 - .../cs/kieler/klighd/ui/view/DiagramView.java | 2 +- .../klighd/ui/view/model/ErrorModel.java | 1 + .../view/syntheses/ErrorModelSynthesis.xtend | 3 +- 19 files changed, 468 insertions(+), 18 deletions(-) create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/.checkstyle create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/.classpath create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/.project create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.core.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.ui.prefs create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/about.html create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/build.properties create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/plugin.xml create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/pom.xml rename plugins/{de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view => de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide}/model/MessageModel.java (98%) rename plugins/{de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view => de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide}/syntheses/EObjectFallbackSynthesis.xtend (99%) rename plugins/{de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view => de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide}/syntheses/MessageModelSynthesis.xtend (97%) rename plugins/{de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view => de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide}/syntheses/action/EcoreModelExpandDetailsAction.java (92%) diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.checkstyle b/plugins/de.cau.cs.kieler.klighd.ide/.checkstyle new file mode 100644 index 000000000..aa91be613 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/.checkstyle @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.classpath b/plugins/de.cau.cs.kieler.klighd.ide/.classpath new file mode 100644 index 000000000..428337e56 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.project b/plugins/de.cau.cs.kieler.klighd.ide/.project new file mode 100644 index 000000000..4b33042a6 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/.project @@ -0,0 +1,40 @@ + + + de.cau.cs.kieler.klighd.ide + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + net.sf.eclipsecs.core.CheckstyleBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + org.eclipse.xtext.ui.shared.xtextNature + net.sf.eclipsecs.core.CheckstyleNature + + diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..c684e86e0 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,286 @@ +eclipse.preferences.version=1 +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=16 +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=100 +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=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=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +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=100 +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=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=true +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true +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 +org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.ui.prefs b/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..32fb1436c --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +formatter_profile=_KIELER +formatter_settings_version=12 +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.text.custom_code_templates= diff --git a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF new file mode 100644 index 000000000..a27963bce --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF @@ -0,0 +1,17 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: KIELER Lightweight Diagrams Ide Components +Bundle-SymbolicName: de.cau.cs.kieler.klighd.ide;singleton:=true +Bundle-Version: 1.1.1.qualifier +Require-Bundle: de.cau.cs.kieler.klighd;visibility:=reexport, + de.cau.cs.kieler.klighd.kgraph, + org.eclipse.xtext.xbase, + de.cau.cs.kieler.klighd.krendering.extensions, + org.eclipse.elk.alg.layered, + org.eclipse.elk.core +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Vendor: Kiel University +Export-Package: de.cau.cs.kieler.klighd.ide.model, + de.cau.cs.kieler.klighd.ide.syntheses, + de.cau.cs.kieler.klighd.ide.syntheses.action diff --git a/plugins/de.cau.cs.kieler.klighd.ide/about.html b/plugins/de.cau.cs.kieler.klighd.ide/about.html new file mode 100644 index 000000000..607ee7e77 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/about.html @@ -0,0 +1,30 @@ + + + + +About + + +

About This Content

+ +

July 01, 2015

+

License

+ +

The Real-Time and Embedded Systems Group, Department of Computer Science, Kiel University ("RTSYS") +makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the RTSYS, the Content is +being redistributed by another party ("Redistributor") 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 via http://www.rtsys.informatik.uni-kiel.de. +(Refer to "KIELER", "Downloads", "Source Code")

+ + + \ No newline at end of file diff --git a/plugins/de.cau.cs.kieler.klighd.ide/build.properties b/plugins/de.cau.cs.kieler.klighd.ide/build.properties new file mode 100644 index 000000000..44e050d97 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/build.properties @@ -0,0 +1,7 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml,\ + about.html,\ + icons/ diff --git a/plugins/de.cau.cs.kieler.klighd.ide/plugin.xml b/plugins/de.cau.cs.kieler.klighd.ide/plugin.xml new file mode 100644 index 000000000..64adcbeb5 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/plugin.xml @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/plugins/de.cau.cs.kieler.klighd.ide/pom.xml b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml new file mode 100644 index 000000000..0a734450b --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + de.cau.cs.kieler.klighd + plugins + 1.1.1-SNAPSHOT + + + de.cau.cs.kieler.klighd + de.cau.cs.kieler.klighd.ide + 1.1.1-SNAPSHOT + eclipse-plugin + + + src + + + org.eclipse.tycho + target-platform-configuration + + + + ignore + + + + + + diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/model/MessageModel.java b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/MessageModel.java similarity index 98% rename from plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/model/MessageModel.java rename to plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/MessageModel.java index f99ee0d0d..810152ca1 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/model/MessageModel.java +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/MessageModel.java @@ -11,7 +11,7 @@ * This code is provided under the terms of the Eclipse Public License (EPL). * See the file epl-v10.html for the license text. */ -package de.cau.cs.kieler.klighd.ui.view.model; +package de.cau.cs.kieler.klighd.ide.model; /** * A simple message model. Provides a title, message and icon. diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/EObjectFallbackSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend similarity index 99% rename from plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/EObjectFallbackSynthesis.xtend rename to plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend index 852b59bf7..8a8a329e7 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/EObjectFallbackSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend @@ -11,7 +11,7 @@ * This code is provided under the terms of the Eclipse Public License (EPL). * See the file epl-v10.html for the license text. */ -package de.cau.cs.kieler.klighd.ui.view.syntheses +package de.cau.cs.kieler.klighd.ide.syntheses import com.google.common.collect.HashBasedTable import com.google.common.collect.Table @@ -32,7 +32,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.microlayout.PlacementUtil import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import de.cau.cs.kieler.klighd.ui.view.syntheses.action.EcoreModelExpandDetailsAction +import de.cau.cs.kieler.klighd.ide.syntheses.action.EcoreModelExpandDetailsAction import de.cau.cs.kieler.klighd.util.KlighdProperties import java.util.List import java.util.Map diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/MessageModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend similarity index 97% rename from plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/MessageModelSynthesis.xtend rename to plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend index f3929070a..cb408fca1 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/MessageModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend @@ -11,14 +11,14 @@ * This code is provided under the terms of the Eclipse Public License (EPL). * See the file epl-v10.html for the license text. */ -package de.cau.cs.kieler.klighd.ui.view.syntheses +package de.cau.cs.kieler.klighd.ide.syntheses +import de.cau.cs.kieler.klighd.ide.model.MessageModel import de.cau.cs.kieler.klighd.kgraph.KNode import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import de.cau.cs.kieler.klighd.ui.view.model.MessageModel import javax.inject.Inject import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/action/EcoreModelExpandDetailsAction.java b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/action/EcoreModelExpandDetailsAction.java similarity index 92% rename from plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/action/EcoreModelExpandDetailsAction.java rename to plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/action/EcoreModelExpandDetailsAction.java index 2fa6bd7ba..99d3cd113 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/action/EcoreModelExpandDetailsAction.java +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/action/EcoreModelExpandDetailsAction.java @@ -10,13 +10,13 @@ * * This code is provided under the terms of the Eclipse Public License (EPL). */ -package de.cau.cs.kieler.klighd.ui.view.syntheses.action; +package de.cau.cs.kieler.klighd.ide.syntheses.action; import java.util.Iterator; import de.cau.cs.kieler.klighd.IAction; +import de.cau.cs.kieler.klighd.ide.syntheses.EObjectFallbackSynthesis; import de.cau.cs.kieler.klighd.kgraph.KNode; -import de.cau.cs.kieler.klighd.ui.view.syntheses.EObjectFallbackSynthesis; import de.cau.cs.kieler.klighd.util.ModelingUtil; /** diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF index 94705b77e..52fe7179f 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF @@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.emf, de.cau.cs.kieler.klighd.ui, de.cau.cs.kieler.klighd.krendering.extensions, org.eclipse.elk.alg.layered, - de.cau.cs.kieler.klighd.kgraph + de.cau.cs.kieler.klighd.kgraph, + de.cau.cs.kieler.klighd.ide Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Vendor: Kiel University diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/plugin.xml b/plugins/de.cau.cs.kieler.klighd.ui.view/plugin.xml index d13f51e92..4ee76cf5b 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/plugin.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/plugin.xml @@ -37,18 +37,10 @@ - - - - Date: Mon, 8 Jun 2020 13:33:04 +0200 Subject: [PATCH 2/5] Moved ErrorModelSynthesis to ide plugin. --- .../META-INF/MANIFEST.MF | 4 ++- .../de.cau.cs.kieler.klighd.ide/plugin.xml | 15 +++++++++-- .../cs/kieler/klighd/ide/KlighdIdePlugin.java | 23 +++++++++++++++++ .../kieler/klighd/ide}/model/ErrorModel.java | 7 +++--- .../ide}/syntheses/ErrorModelSynthesis.xtend | 10 ++++---- ...AbstractErrorModelShowExceptionAction.java | 25 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 5 ++-- .../plugin.xml | 12 --------- .../cs/kieler/klighd/ui/view/DiagramView.java | 2 +- .../action/ErrorModelShowExceptionAction.java | 10 +++----- 10 files changed, 78 insertions(+), 35 deletions(-) create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/KlighdIdePlugin.java rename plugins/{de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view => de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide}/model/ErrorModel.java (94%) rename plugins/{de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view => de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide}/syntheses/ErrorModelSynthesis.xtend (88%) create mode 100644 plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/action/AbstractErrorModelShowExceptionAction.java diff --git a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF index a27963bce..7474fca05 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ide/META-INF/MANIFEST.MF @@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: KIELER Lightweight Diagrams Ide Components Bundle-SymbolicName: de.cau.cs.kieler.klighd.ide;singleton:=true Bundle-Version: 1.1.1.qualifier +Automatic-Module-Name: de.cau.cs.kieler.klighd.ide Require-Bundle: de.cau.cs.kieler.klighd;visibility:=reexport, de.cau.cs.kieler.klighd.kgraph, org.eclipse.xtext.xbase, @@ -12,6 +13,7 @@ Require-Bundle: de.cau.cs.kieler.klighd;visibility:=reexport, Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Kiel University -Export-Package: de.cau.cs.kieler.klighd.ide.model, +Export-Package: de.cau.cs.kieler.klighd.ide, + de.cau.cs.kieler.klighd.ide.model, de.cau.cs.kieler.klighd.ide.syntheses, de.cau.cs.kieler.klighd.ide.syntheses.action diff --git a/plugins/de.cau.cs.kieler.klighd.ide/plugin.xml b/plugins/de.cau.cs.kieler.klighd.ide/plugin.xml index 64adcbeb5..934b25630 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/plugin.xml +++ b/plugins/de.cau.cs.kieler.klighd.ide/plugin.xml @@ -5,11 +5,22 @@ point="de.cau.cs.kieler.klighd.diagramSyntheses"> + id="de.cau.cs.kieler.klighd.ui.syntheses.MessageModelSynthesis"> + id="de.cau.cs.kieler.klighd.ui.syntheses.EObjectFallbackSynthesis"> + + + + + + diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/KlighdIdePlugin.java b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/KlighdIdePlugin.java new file mode 100644 index 000000000..d0f7852f6 --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/KlighdIdePlugin.java @@ -0,0 +1,23 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2020 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This code is provided under the terms of the Eclipse Public License (EPL). + */ +package de.cau.cs.kieler.klighd.ide; + +/** + * @author sdo + * + */ +public class KlighdIdePlugin { + + /** The plug-in ID. */ + public static final String UI_VIEW_PLUGIN_ID = "de.cau.cs.kieler.klighd.ui.view"; //$NON-NLS-1$ +} diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/model/ErrorModel.java b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/ErrorModel.java similarity index 94% rename from plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/model/ErrorModel.java rename to plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/ErrorModel.java index 0b73ce5e0..e7ba7859c 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/model/ErrorModel.java +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/ErrorModel.java @@ -11,15 +11,14 @@ * This code is provided under the terms of the Eclipse Public License (EPL). * See the file epl-v10.html for the license text. */ -package de.cau.cs.kieler.klighd.ui.view.model; +package de.cau.cs.kieler.klighd.ide.model; import java.io.PrintWriter; import java.io.StringWriter; import org.eclipse.core.runtime.Platform; -import de.cau.cs.kieler.klighd.ide.model.MessageModel; -import de.cau.cs.kieler.klighd.ui.view.KlighdViewPlugin; +import de.cau.cs.kieler.klighd.ide.KlighdIdePlugin; /** * Represents errors and exceptions. Displayed as error message with a huge error sign. @@ -56,7 +55,7 @@ public ErrorModel(final String message) { */ public ErrorModel(final String message, final String reason, final String stacktrace) { // CHECKSTYLEOFF MagicNumber NEXT - super(message, reason, KlighdViewPlugin.PLUGIN_ID, "icons/full/model/error_sign.png", 250); + super(message, reason, KlighdIdePlugin.UI_VIEW_PLUGIN_ID, "icons/full/model/error_sign.png", 250); // reason String reasonToSet = "Unkown"; if (reason == null) { diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/ErrorModelSynthesis.xtend b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend similarity index 88% rename from plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/ErrorModelSynthesis.xtend rename to plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend index 46a5f72cb..c02ffac81 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/src/de/cau/cs/kieler/klighd/ui/view/syntheses/ErrorModelSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend @@ -11,7 +11,7 @@ * This code is provided under the terms of the Eclipse Public License (EPL). * See the file epl-v10.html for the license text. */ -package de.cau.cs.kieler.klighd.ui.view.syntheses +package de.cau.cs.kieler.klighd.ide.syntheses import de.cau.cs.kieler.klighd.ide.model.MessageModel import de.cau.cs.kieler.klighd.ide.syntheses.MessageModelSynthesis @@ -22,8 +22,8 @@ import de.cau.cs.kieler.klighd.krendering.KRoundedRectangle import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import de.cau.cs.kieler.klighd.ui.view.model.ErrorModel -import de.cau.cs.kieler.klighd.ui.view.syntheses.action.ErrorModelShowExceptionAction +import de.cau.cs.kieler.klighd.ide.model.ErrorModel +import de.cau.cs.kieler.klighd.ide.syntheses.action.AbstractErrorModelShowExceptionAction import javax.inject.Inject /** @@ -68,8 +68,8 @@ class ErrorModelSynthesis extends AbstractDiagramSynthesis { messageRect.addText("[Show Exception]") => [ foreground = Colors.BLUE; fontSize = 9; - addSingleClickAction(ErrorModelShowExceptionAction.ID); - addDoubleClickAction(ErrorModelShowExceptionAction.ID); + addSingleClickAction(AbstractErrorModelShowExceptionAction.ID); + addDoubleClickAction(AbstractErrorModelShowExceptionAction.ID); setGridPlacementData().from(LEFT, 8, 0, TOP, 4, 0).to(RIGHT, 8, 0, BOTTOM, 8, 0); ] } diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/action/AbstractErrorModelShowExceptionAction.java b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/action/AbstractErrorModelShowExceptionAction.java new file mode 100644 index 000000000..d28a8fcbf --- /dev/null +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/action/AbstractErrorModelShowExceptionAction.java @@ -0,0 +1,25 @@ +/* + * KIELER - Kiel Integrated Environment for Layout Eclipse RichClient + * + * http://rtsys.informatik.uni-kiel.de/kieler + * + * Copyright 2020 by + * + Kiel University + * + Department of Computer Science + * + Real-Time and Embedded Systems Group + * + * This code is provided under the terms of the Eclipse Public License (EPL). + */ +package de.cau.cs.kieler.klighd.ide.syntheses.action; + +import de.cau.cs.kieler.klighd.IAction; + +/** + * @author sdo + * + */ +public abstract class AbstractErrorModelShowExceptionAction implements IAction { + + /** The action ID. */ + public static final String ID = "de.cau.cs.kieler.klighd.ui.view.syntheses.action.ErrorModelShowExceptionAction"; +} diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF index 52fe7179f..07799c0fc 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/META-INF/MANIFEST.MF @@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: KIELER Diagram View Bundle-SymbolicName: de.cau.cs.kieler.klighd.ui.view;singleton:=true Bundle-Version: 1.1.1.qualifier +Automatic-Module-Name: de.cau.cs.kieler.klighd.ui.view Bundle-Activator: de.cau.cs.kieler.klighd.ui.view.KlighdViewPlugin Require-Bundle: org.eclipse.emf, org.eclipse.ui.ide, @@ -20,6 +21,4 @@ Bundle-Vendor: Kiel University Export-Package: de.cau.cs.kieler.klighd.ui.view, de.cau.cs.kieler.klighd.ui.view.controller, de.cau.cs.kieler.klighd.ui.view.controllers, - de.cau.cs.kieler.klighd.ui.view.menu, - de.cau.cs.kieler.klighd.ui.view.model, - de.cau.cs.kieler.klighd.ui.view.syntheses + de.cau.cs.kieler.klighd.ui.view.menu diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/plugin.xml b/plugins/de.cau.cs.kieler.klighd.ui.view/plugin.xml index 4ee76cf5b..2e1d3bd44 100644 --- a/plugins/de.cau.cs.kieler.klighd.ui.view/plugin.xml +++ b/plugins/de.cau.cs.kieler.klighd.ui.view/plugin.xml @@ -21,10 +21,6 @@ class="de.cau.cs.kieler.klighd.ui.view.syntheses.action.ErrorModelShowExceptionAction" id="de.cau.cs.kieler.klighd.ui.view.syntheses.action.ErrorModelShowExceptionAction"> - - @@ -35,14 +31,6 @@ class="de.cau.cs.kieler.klighd.ui.view.controllers.EcoreXtextSaveUpdateController"> - - - - - Date: Mon, 8 Jun 2020 13:46:46 +0200 Subject: [PATCH 3/5] Moved icon to ide plugin. --- .../icons/full/model/error_sign.png | Bin .../icons/full/model/error_sign.svg | 0 .../cau/cs/kieler/klighd/ide/KlighdIdePlugin.java | 2 +- .../cau/cs/kieler/klighd/ide/model/ErrorModel.java | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename plugins/{de.cau.cs.kieler.klighd.ui.view => de.cau.cs.kieler.klighd.ide}/icons/full/model/error_sign.png (100%) rename plugins/{de.cau.cs.kieler.klighd.ui.view => de.cau.cs.kieler.klighd.ide}/icons/full/model/error_sign.svg (100%) diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/icons/full/model/error_sign.png b/plugins/de.cau.cs.kieler.klighd.ide/icons/full/model/error_sign.png similarity index 100% rename from plugins/de.cau.cs.kieler.klighd.ui.view/icons/full/model/error_sign.png rename to plugins/de.cau.cs.kieler.klighd.ide/icons/full/model/error_sign.png diff --git a/plugins/de.cau.cs.kieler.klighd.ui.view/icons/full/model/error_sign.svg b/plugins/de.cau.cs.kieler.klighd.ide/icons/full/model/error_sign.svg similarity index 100% rename from plugins/de.cau.cs.kieler.klighd.ui.view/icons/full/model/error_sign.svg rename to plugins/de.cau.cs.kieler.klighd.ide/icons/full/model/error_sign.svg diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/KlighdIdePlugin.java b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/KlighdIdePlugin.java index d0f7852f6..8e916dc1d 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/KlighdIdePlugin.java +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/KlighdIdePlugin.java @@ -19,5 +19,5 @@ public class KlighdIdePlugin { /** The plug-in ID. */ - public static final String UI_VIEW_PLUGIN_ID = "de.cau.cs.kieler.klighd.ui.view"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "de.cau.cs.kieler.klighd.ide"; //$NON-NLS-1$ } diff --git a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/ErrorModel.java b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/ErrorModel.java index e7ba7859c..ad72027df 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/ErrorModel.java +++ b/plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/model/ErrorModel.java @@ -55,7 +55,7 @@ public ErrorModel(final String message) { */ public ErrorModel(final String message, final String reason, final String stacktrace) { // CHECKSTYLEOFF MagicNumber NEXT - super(message, reason, KlighdIdePlugin.UI_VIEW_PLUGIN_ID, "icons/full/model/error_sign.png", 250); + super(message, reason, KlighdIdePlugin.PLUGIN_ID, "icons/full/model/error_sign.png", 250); // reason String reasonToSet = "Unkown"; if (reason == null) { From 1b41d49779c13eb3bd64cbb7be2c59eb71293bed Mon Sep 17 00:00:00 2001 From: Soeren Domroes Date: Mon, 8 Jun 2020 17:18:19 +0200 Subject: [PATCH 4/5] Added klighd.ide module to pom. --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 0e38d5f74..72718bbc9 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ features plugins/de.cau.cs.kieler.klighd + plugins/de.cau.cs.kieler.klighd.ide plugins/de.cau.cs.kieler.klighd.incremental plugins/de.cau.cs.kieler.klighd.kgraph plugins/de.cau.cs.kieler.klighd.krendering From 17fbb46448bf66b6f8a199cefe73a16fdbae6cb9 Mon Sep 17 00:00:00 2001 From: Soeren Domroes Date: Tue, 9 Jun 2020 10:24:33 +0200 Subject: [PATCH 5/5] klighd.ide: Added xtend-gen as source folder. --- plugins/de.cau.cs.kieler.klighd.ide/build.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/de.cau.cs.kieler.klighd.ide/build.properties b/plugins/de.cau.cs.kieler.klighd.ide/build.properties index 44e050d97..74b70cb95 100644 --- a/plugins/de.cau.cs.kieler.klighd.ide/build.properties +++ b/plugins/de.cau.cs.kieler.klighd.ide/build.properties @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + xtend-gen/ output.. = bin/ bin.includes = META-INF/,\ .,\