From c29b48ab311259a82ffcef6b0460979e28f79e8b Mon Sep 17 00:00:00 2001 From: Soeren Domroes Date: Tue, 5 Dec 2023 14:32:35 +0100 Subject: [PATCH] Purged Java 1.8 from setup and classpath and manifests. --- plugins/org.eclipse.elk.alg.common/.classpath | 6 ++- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 4 +- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.alg.disco/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 31 ++++++++++++++-- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.alg.force/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 31 ++++++++++++++-- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 6 +-- .../.settings/org.eclipse.jdt.core.prefs | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 8 +++- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.elk.alg.layered/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 31 ++++++++++++++-- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.alg.mrtree/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 31 ++++++++++++++-- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.alg.radial/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 31 ++++++++++++++-- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.alg.spore/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 37 +++++++++++++++++-- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 31 ++++++++++++++-- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.conn.gmf/.classpath | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 31 ++++++++++++++-- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 8 ++-- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 8 ++-- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 8 ++-- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.core.debug/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.elk.core.meta.ui/.classpath | 8 ++-- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.core.meta/.classpath | 8 ++-- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.elk.core.service/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 4 +- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.core.ui/.classpath | 4 +- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.core/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 31 ++++++++++++++-- .../org.eclipse.elk.core/META-INF/MANIFEST.MF | 2 +- .../.classpath | 10 ++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 10 ++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 10 ++--- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.graph.json/.classpath | 6 +-- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.elk.graph.text.ide/.classpath | 8 ++-- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.elk.graph.text.ui/.classpath | 8 ++-- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.graph.text/.classpath | 8 ++-- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.elk.graph/.classpath | 4 +- .../META-INF/MANIFEST.MF | 2 +- setups/EclipseLayoutKernel.setup | 4 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.elk.alg.disco.test/.classpath | 8 +++- .../META-INF/MANIFEST.MF | 3 +- .../org.eclipse.elk.alg.force.test/.classpath | 8 +++- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.elk.alg.spore.test/.classpath | 8 +++- .../META-INF/MANIFEST.MF | 2 +- test/org.eclipse.elk.alg.test/.classpath | 8 +++- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- test/org.eclipse.elk.core.test/.classpath | 8 +++- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 14 +++++-- .../META-INF/MANIFEST.MF | 2 +- test/org.eclipse.elk.graph.test/.classpath | 8 +++- .../META-INF/MANIFEST.MF | 2 +- test/org.eclipse.elk.shared.test/.classpath | 8 +++- .../META-INF/MANIFEST.MF | 2 +- 100 files changed, 448 insertions(+), 182 deletions(-) diff --git a/plugins/org.eclipse.elk.alg.common/.classpath b/plugins/org.eclipse.elk.alg.common/.classpath index f0c5549859..dfa5bf5642 100644 --- a/plugins/org.eclipse.elk.alg.common/.classpath +++ b/plugins/org.eclipse.elk.alg.common/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/plugins/org.eclipse.elk.alg.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.common/META-INF/MANIFEST.MF index 46ea2eb0ef..37d68fc8b6 100644 --- a/plugins/org.eclipse.elk.alg.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.common/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: ELK Common Algorithms Bundle-SymbolicName: org.eclipse.elk.alg.common;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava, org.eclipse.elk.core, org.eclipse.elk.graph diff --git a/plugins/org.eclipse.elk.alg.disco.debug/.classpath b/plugins/org.eclipse.elk.alg.disco.debug/.classpath index eca7bdba8f..e801ebfb46 100644 --- a/plugins/org.eclipse.elk.alg.disco.debug/.classpath +++ b/plugins/org.eclipse.elk.alg.disco.debug/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.alg.disco.debug/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.alg.disco.debug/.settings/org.eclipse.jdt.core.prefs index ded2f0e8c6..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.alg.disco.debug/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.alg.disco.debug/.settings/org.eclipse.jdt.core.prefs @@ -8,8 +8,10 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 diff --git a/plugins/org.eclipse.elk.alg.disco.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.disco.debug/META-INF/MANIFEST.MF index a8c4edcd79..349bc3fd68 100644 --- a/plugins/org.eclipse.elk.alg.disco.debug/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.disco.debug/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ELK DisCo Debugging Utilities Bundle-SymbolicName: org.eclipse.elk.alg.disco.debug;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava, org.eclipse.ui, org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.elk.alg.disco/.classpath b/plugins/org.eclipse.elk.alg.disco/.classpath index f0c5549859..ad5e13cce7 100644 --- a/plugins/org.eclipse.elk.alg.disco/.classpath +++ b/plugins/org.eclipse.elk.alg.disco/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.alg.disco/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.alg.disco/.settings/org.eclipse.jdt.core.prefs index cd7f0db5f9..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.alg.disco/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.alg.disco/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,13 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 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 @@ -18,17 +22,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c 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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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 @@ -114,11 +121,12 @@ 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_additive_operator=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_bitwise_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 @@ -149,6 +157,8 @@ 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -173,13 +183,17 @@ 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -227,6 +241,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -263,9 +279,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -291,7 +310,11 @@ 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_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=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/org.eclipse.elk.alg.disco/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.disco/META-INF/MANIFEST.MF index 1933ed4394..6b36746622 100644 --- a/plugins/org.eclipse.elk.alg.disco/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.disco/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: com.google.guava, org.eclipse.elk.core, org.eclipse.elk.graph, org.eclipse.elk.alg.common -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.alg.disco, org.eclipse.elk.alg.disco.graph, org.eclipse.elk.alg.disco.options, diff --git a/plugins/org.eclipse.elk.alg.force/.classpath b/plugins/org.eclipse.elk.alg.force/.classpath index f0c5549859..ad5e13cce7 100644 --- a/plugins/org.eclipse.elk.alg.force/.classpath +++ b/plugins/org.eclipse.elk.alg.force/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.alg.force/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.alg.force/.settings/org.eclipse.jdt.core.prefs index cd7f0db5f9..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.alg.force/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.alg.force/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,13 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 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 @@ -18,17 +22,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c 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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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 @@ -114,11 +121,12 @@ 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_additive_operator=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_bitwise_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 @@ -149,6 +157,8 @@ 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -173,13 +183,17 @@ 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -227,6 +241,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -263,9 +279,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -291,7 +310,11 @@ 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_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=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/org.eclipse.elk.alg.force/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.force/META-INF/MANIFEST.MF index 286a22b2e9..46dff289a5 100644 --- a/plugins/org.eclipse.elk.alg.force/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.force/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: ELK Force Layout Algorithm Bundle-SymbolicName: org.eclipse.elk.alg.force;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava, org.eclipse.elk.alg.common, org.eclipse.elk.core, diff --git a/plugins/org.eclipse.elk.alg.graphviz.dot/.classpath b/plugins/org.eclipse.elk.alg.graphviz.dot/.classpath index 2f7cbadbd9..95cdcb1209 100644 --- a/plugins/org.eclipse.elk.alg.graphviz.dot/.classpath +++ b/plugins/org.eclipse.elk.alg.graphviz.dot/.classpath @@ -1,9 +1,9 @@ + + - - - + diff --git a/plugins/org.eclipse.elk.alg.graphviz.dot/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.alg.graphviz.dot/.settings/org.eclipse.jdt.core.prefs index ded2f0e8c6..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.alg.graphviz.dot/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.alg.graphviz.dot/.settings/org.eclipse.jdt.core.prefs @@ -8,8 +8,10 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 diff --git a/plugins/org.eclipse.elk.alg.graphviz.dot/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.graphviz.dot/META-INF/MANIFEST.MF index 619472ad6c..bf843019b7 100644 --- a/plugins/org.eclipse.elk.alg.graphviz.dot/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.graphviz.dot/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.9.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.eclipse.xtext.util, org.eclipse.emf.common -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.alg.graphviz.dot, org.eclipse.elk.alg.graphviz.dot.formatting2, org.eclipse.elk.alg.graphviz.dot.serializer, diff --git a/plugins/org.eclipse.elk.alg.graphviz.layouter/.classpath b/plugins/org.eclipse.elk.alg.graphviz.layouter/.classpath index 2534a1484b..dfa5bf5642 100644 --- a/plugins/org.eclipse.elk.alg.graphviz.layouter/.classpath +++ b/plugins/org.eclipse.elk.alg.graphviz.layouter/.classpath @@ -1,8 +1,12 @@ + + + + + + - - diff --git a/plugins/org.eclipse.elk.alg.graphviz.layouter/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.graphviz.layouter/META-INF/MANIFEST.MF index 45fd6c0b24..3eca65f6dc 100644 --- a/plugins/org.eclipse.elk.alg.graphviz.layouter/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.graphviz.layouter/META-INF/MANIFEST.MF @@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.ui;resolution:=optional, org.eclipse.elk.alg.graphviz.dot Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.alg.graphviz.layouter diff --git a/plugins/org.eclipse.elk.alg.layered/.classpath b/plugins/org.eclipse.elk.alg.layered/.classpath index f0c5549859..ad5e13cce7 100644 --- a/plugins/org.eclipse.elk.alg.layered/.classpath +++ b/plugins/org.eclipse.elk.alg.layered/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.alg.layered/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.alg.layered/.settings/org.eclipse.jdt.core.prefs index cd7f0db5f9..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.alg.layered/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.alg.layered/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,13 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 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 @@ -18,17 +22,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c 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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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 @@ -114,11 +121,12 @@ 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_additive_operator=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_bitwise_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 @@ -149,6 +157,8 @@ 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -173,13 +183,17 @@ 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -227,6 +241,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -263,9 +279,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -291,7 +310,11 @@ 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_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=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/org.eclipse.elk.alg.layered/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.layered/META-INF/MANIFEST.MF index 3909a7d717..6b1ff92889 100644 --- a/plugins/org.eclipse.elk.alg.layered/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.layered/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: ELK Layered Layout Algorithm Bundle-SymbolicName: org.eclipse.elk.alg.layered;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib;bundle-version="2.10.0", org.eclipse.elk.graph, diff --git a/plugins/org.eclipse.elk.alg.mrtree/.classpath b/plugins/org.eclipse.elk.alg.mrtree/.classpath index f0c5549859..ad5e13cce7 100644 --- a/plugins/org.eclipse.elk.alg.mrtree/.classpath +++ b/plugins/org.eclipse.elk.alg.mrtree/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.alg.mrtree/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.alg.mrtree/.settings/org.eclipse.jdt.core.prefs index cd7f0db5f9..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.alg.mrtree/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.alg.mrtree/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,13 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 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 @@ -18,17 +22,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c 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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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 @@ -114,11 +121,12 @@ 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_additive_operator=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_bitwise_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 @@ -149,6 +157,8 @@ 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -173,13 +183,17 @@ 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -227,6 +241,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -263,9 +279,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -291,7 +310,11 @@ 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_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=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/org.eclipse.elk.alg.mrtree/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.mrtree/META-INF/MANIFEST.MF index 6a6d3f8597..7e52d75fde 100644 --- a/plugins/org.eclipse.elk.alg.mrtree/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.mrtree/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: ELK Mr. Tree Layout Algorithm Bundle-SymbolicName: org.eclipse.elk.alg.mrtree;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.elk.alg.common, org.eclipse.elk.core, org.eclipse.elk.graph, diff --git a/plugins/org.eclipse.elk.alg.radial/.classpath b/plugins/org.eclipse.elk.alg.radial/.classpath index f0c5549859..ad5e13cce7 100644 --- a/plugins/org.eclipse.elk.alg.radial/.classpath +++ b/plugins/org.eclipse.elk.alg.radial/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.alg.radial/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.radial/META-INF/MANIFEST.MF index a28cfdebae..f68b1bc6b7 100644 --- a/plugins/org.eclipse.elk.alg.radial/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.radial/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ELK Radial Layout Algorithm Bundle-SymbolicName: org.eclipse.elk.alg.radial;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava, org.eclipse.elk.core, org.eclipse.elk.graph, diff --git a/plugins/org.eclipse.elk.alg.rectpacking/.classpath b/plugins/org.eclipse.elk.alg.rectpacking/.classpath index f0c5549859..ad5e13cce7 100644 --- a/plugins/org.eclipse.elk.alg.rectpacking/.classpath +++ b/plugins/org.eclipse.elk.alg.rectpacking/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.alg.rectpacking/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.alg.rectpacking/.settings/org.eclipse.jdt.core.prefs index cd7f0db5f9..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.alg.rectpacking/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.alg.rectpacking/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,13 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 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 @@ -18,17 +22,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c 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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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 @@ -114,11 +121,12 @@ 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_additive_operator=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_bitwise_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 @@ -149,6 +157,8 @@ 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -173,13 +183,17 @@ 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -227,6 +241,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -263,9 +279,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -291,7 +310,11 @@ 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_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=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/org.eclipse.elk.alg.rectpacking/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.rectpacking/META-INF/MANIFEST.MF index 355b04155b..b36e101203 100644 --- a/plugins/org.eclipse.elk.alg.rectpacking/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.rectpacking/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: ELK Rectangle Packing Algorithm Bundle-SymbolicName: org.eclipse.elk.alg.rectpacking;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.elk.alg.common, org.eclipse.elk.core, org.eclipse.elk.graph, diff --git a/plugins/org.eclipse.elk.alg.spore/.classpath b/plugins/org.eclipse.elk.alg.spore/.classpath index f0c5549859..ad5e13cce7 100644 --- a/plugins/org.eclipse.elk.alg.spore/.classpath +++ b/plugins/org.eclipse.elk.alg.spore/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.alg.spore/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.alg.spore/.settings/org.eclipse.jdt.core.prefs index 9ea8ecfd5a..d1d4d0abd6 100644 --- a/plugins/org.eclipse.elk.alg.spore/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.alg.spore/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,15 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 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 @@ -7,17 +17,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c 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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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 @@ -103,11 +116,12 @@ 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_additive_operator=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_bitwise_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 @@ -138,6 +152,8 @@ 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -162,13 +178,17 @@ 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -216,6 +236,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -252,9 +274,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -280,7 +305,11 @@ 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_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=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/org.eclipse.elk.alg.spore/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.spore/META-INF/MANIFEST.MF index 8d15611230..4951404996 100644 --- a/plugins/org.eclipse.elk.alg.spore/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.spore/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: ELK SPOrE Bundle-SymbolicName: org.eclipse.elk.alg.spore;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava, org.eclipse.elk.graph, org.eclipse.elk.core, diff --git a/plugins/org.eclipse.elk.alg.topdownpacking/.classpath b/plugins/org.eclipse.elk.alg.topdownpacking/.classpath index f0c5549859..ad5e13cce7 100644 --- a/plugins/org.eclipse.elk.alg.topdownpacking/.classpath +++ b/plugins/org.eclipse.elk.alg.topdownpacking/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.alg.topdownpacking/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.alg.topdownpacking/.settings/org.eclipse.jdt.core.prefs index cd7f0db5f9..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.alg.topdownpacking/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.alg.topdownpacking/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,13 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 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 @@ -18,17 +22,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c 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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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 @@ -114,11 +121,12 @@ 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_additive_operator=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_bitwise_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 @@ -149,6 +157,8 @@ 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -173,13 +183,17 @@ 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -227,6 +241,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -263,9 +279,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -291,7 +310,11 @@ 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_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=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/org.eclipse.elk.alg.topdownpacking/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.alg.topdownpacking/META-INF/MANIFEST.MF index ad1a164263..b381edbd95 100644 --- a/plugins/org.eclipse.elk.alg.topdownpacking/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.alg.topdownpacking/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: ELK Topdown Packing Algorithm Bundle-SymbolicName: org.eclipse.elk.alg.topdownpacking;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.elk.core, org.eclipse.elk.graph, org.eclipse.elk.alg.common, diff --git a/plugins/org.eclipse.elk.conn.gmf/.classpath b/plugins/org.eclipse.elk.conn.gmf/.classpath index 2534a1484b..ad5e13cce7 100644 --- a/plugins/org.eclipse.elk.conn.gmf/.classpath +++ b/plugins/org.eclipse.elk.conn.gmf/.classpath @@ -1,8 +1,8 @@ + + - - diff --git a/plugins/org.eclipse.elk.conn.gmf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.conn.gmf/.settings/org.eclipse.jdt.core.prefs index cd7f0db5f9..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.conn.gmf/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.conn.gmf/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,13 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 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 @@ -18,17 +22,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c 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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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 @@ -114,11 +121,12 @@ 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_additive_operator=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_bitwise_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 @@ -149,6 +157,8 @@ 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -173,13 +183,17 @@ 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -227,6 +241,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -263,9 +279,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -291,7 +310,11 @@ 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_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=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/org.eclipse.elk.conn.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.conn.gmf/META-INF/MANIFEST.MF index 5d5f8c4f64..150e7e1f2f 100644 --- a/plugins/org.eclipse.elk.conn.gmf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.conn.gmf/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: ELK Layout Connector for GMF Bundle-SymbolicName: org.eclipse.elk.conn.gmf;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.conn.gmf Require-Bundle: org.eclipse.gef;bundle-version="3.5.0", org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.2.0", diff --git a/plugins/org.eclipse.elk.core.debug.grandom.ide/.classpath b/plugins/org.eclipse.elk.core.debug.grandom.ide/.classpath index 9081d4f703..a70cf0d9af 100644 --- a/plugins/org.eclipse.elk.core.debug.grandom.ide/.classpath +++ b/plugins/org.eclipse.elk.core.debug.grandom.ide/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/plugins/org.eclipse.elk.core.debug.grandom.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.core.debug.grandom.ide/META-INF/MANIFEST.MF index c1b6f970b7..c99bd56e55 100644 --- a/plugins/org.eclipse.elk.core.debug.grandom.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.core.debug.grandom.ide/META-INF/MANIFEST.MF @@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.elk.core.debug.grandom, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.core.debug.grandom.ide.contentassist.antlr.internal, org.eclipse.elk.core.debug.grandom.ide.contentassist.antlr diff --git a/plugins/org.eclipse.elk.core.debug.grandom.ui/.classpath b/plugins/org.eclipse.elk.core.debug.grandom.ui/.classpath index 9081d4f703..a70cf0d9af 100644 --- a/plugins/org.eclipse.elk.core.debug.grandom.ui/.classpath +++ b/plugins/org.eclipse.elk.core.debug.grandom.ui/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/plugins/org.eclipse.elk.core.debug.grandom.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.core.debug.grandom.ui/META-INF/MANIFEST.MF index 2c611a4438..bc6522f2a0 100644 --- a/plugins/org.eclipse.elk.core.debug.grandom.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.core.debug.grandom.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.elk.core.debug.grandom, org.eclipse.elk.graph, org.eclipse.elk.core Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.core.debug.grandom.ui, org.eclipse.elk.core.debug.grandom.ui.contentassist, org.eclipse.elk.core.debug.grandom.ui.internal, diff --git a/plugins/org.eclipse.elk.core.debug.grandom/.classpath b/plugins/org.eclipse.elk.core.debug.grandom/.classpath index 9081d4f703..a70cf0d9af 100644 --- a/plugins/org.eclipse.elk.core.debug.grandom/.classpath +++ b/plugins/org.eclipse.elk.core.debug.grandom/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/plugins/org.eclipse.elk.core.debug.grandom/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.core.debug.grandom/META-INF/MANIFEST.MF index 4c3db8093a..50c64726e2 100644 --- a/plugins/org.eclipse.elk.core.debug.grandom/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.core.debug.grandom/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.emf.common, org.eclipse.elk.graph, org.eclipse.elk.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.core.debug.grandom, org.eclipse.elk.core.debug.grandom.gRandom, org.eclipse.elk.core.debug.grandom.gRandom.impl, diff --git a/plugins/org.eclipse.elk.core.debug/.classpath b/plugins/org.eclipse.elk.core.debug/.classpath index 428337e560..47ce7cd075 100644 --- a/plugins/org.eclipse.elk.core.debug/.classpath +++ b/plugins/org.eclipse.elk.core.debug/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.core.debug/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.core.debug/.settings/org.eclipse.jdt.core.prefs index ded2f0e8c6..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.core.debug/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.core.debug/.settings/org.eclipse.jdt.core.prefs @@ -8,8 +8,10 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 diff --git a/plugins/org.eclipse.elk.core.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.core.debug/META-INF/MANIFEST.MF index e85ba2f433..3bc214e67f 100644 --- a/plugins/org.eclipse.elk.core.debug/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.core.debug/META-INF/MANIFEST.MF @@ -17,6 +17,6 @@ Require-Bundle: com.google.guava, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Modeling Project diff --git a/plugins/org.eclipse.elk.core.meta.ui/.classpath b/plugins/org.eclipse.elk.core.meta.ui/.classpath index 9081d4f703..a70cf0d9af 100644 --- a/plugins/org.eclipse.elk.core.meta.ui/.classpath +++ b/plugins/org.eclipse.elk.core.meta.ui/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/plugins/org.eclipse.elk.core.meta.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.core.meta.ui/META-INF/MANIFEST.MF index 5ea3dca99d..cb035559af 100644 --- a/plugins/org.eclipse.elk.core.meta.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.core.meta.ui/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.elk.core.meta, org.eclipse.jdt.debug.ui, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.core.meta.ui.internal, org.eclipse.elk.core.meta.ui.quickfix, org.eclipse.elk.core.meta.ui.contentassist, diff --git a/plugins/org.eclipse.elk.core.meta/.classpath b/plugins/org.eclipse.elk.core.meta/.classpath index 9081d4f703..a70cf0d9af 100644 --- a/plugins/org.eclipse.elk.core.meta/.classpath +++ b/plugins/org.eclipse.elk.core.meta/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/plugins/org.eclipse.elk.core.meta/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.core.meta/META-INF/MANIFEST.MF index 6c074e0b37..9f3c00656e 100644 --- a/plugins/org.eclipse.elk.core.meta/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.core.meta/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.12.0", org.eclipse.xtend.lib;bundle-version="2.14.0", org.eclipse.emf.common, org.eclipse.elk.graph -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.core.meta, org.eclipse.elk.core.meta.formatting2, org.eclipse.elk.core.meta.jvmmodel, diff --git a/plugins/org.eclipse.elk.core.service/.classpath b/plugins/org.eclipse.elk.core.service/.classpath index eca7bdba8f..e801ebfb46 100644 --- a/plugins/org.eclipse.elk.core.service/.classpath +++ b/plugins/org.eclipse.elk.core.service/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.core.service/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.core.service/.settings/org.eclipse.jdt.core.prefs index ded2f0e8c6..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.core.service/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.core.service/.settings/org.eclipse.jdt.core.prefs @@ -8,8 +8,10 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 diff --git a/plugins/org.eclipse.elk.core.service/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.core.service/META-INF/MANIFEST.MF index ca0f141a24..432daadde5 100644 --- a/plugins/org.eclipse.elk.core.service/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.core.service/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: com.google.guava, org.eclipse.elk.graph, org.eclipse.elk.core;visibility:=reexport Eclipse-RegisterBuddy: org.eclipse.elk.core -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.core.service, org.eclipse.elk.core.service.internal;x-internal:=true, org.eclipse.elk.core.service.util diff --git a/plugins/org.eclipse.elk.core.ui/.classpath b/plugins/org.eclipse.elk.core.ui/.classpath index 22f30643cb..edc8895124 100644 --- a/plugins/org.eclipse.elk.core.ui/.classpath +++ b/plugins/org.eclipse.elk.core.ui/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/plugins/org.eclipse.elk.core.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.core.ui/META-INF/MANIFEST.MF index 420e941ed3..4770cf878f 100644 --- a/plugins/org.eclipse.elk.core.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.core.ui/META-INF/MANIFEST.MF @@ -21,5 +21,5 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.4.0", org.eclipse.elk.graph, org.eclipse.elk.core, org.eclipse.elk.core.service -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.elk.core/.classpath b/plugins/org.eclipse.elk.core/.classpath index f0c5549859..ad5e13cce7 100644 --- a/plugins/org.eclipse.elk.core/.classpath +++ b/plugins/org.eclipse.elk.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.elk.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.elk.core/.settings/org.eclipse.jdt.core.prefs index cd7f0db5f9..dec65fc9a4 100644 --- a/plugins/org.eclipse.elk.core/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.elk.core/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,13 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 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 @@ -18,17 +22,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c 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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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 @@ -114,11 +121,12 @@ 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_additive_operator=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_bitwise_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 @@ -149,6 +157,8 @@ 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -173,13 +183,17 @@ 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -227,6 +241,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -263,9 +279,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -291,7 +310,11 @@ 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_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=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/org.eclipse.elk.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.core/META-INF/MANIFEST.MF index b85dc45488..2d92c39cda 100644 --- a/plugins/org.eclipse.elk.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.core/META-INF/MANIFEST.MF @@ -24,5 +24,5 @@ Export-Package: org.eclipse.elk.core, org.eclipse.elk.core.util.selection, org.eclipse.elk.core.validation Bundle-Vendor: Eclipse Modeling Project -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.elk.graph.json.text.ide/.classpath b/plugins/org.eclipse.elk.graph.json.text.ide/.classpath index 8d26fa5987..a70cf0d9af 100644 --- a/plugins/org.eclipse.elk.graph.json.text.ide/.classpath +++ b/plugins/org.eclipse.elk.graph.json.text.ide/.classpath @@ -1,9 +1,9 @@ - - - - + - + + + + diff --git a/plugins/org.eclipse.elk.graph.json.text.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.graph.json.text.ide/META-INF/MANIFEST.MF index 1e30e37ff3..12cd53ed6e 100644 --- a/plugins/org.eclipse.elk.graph.json.text.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.graph.json.text.ide/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.elk.core, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.graph.json.text.ide, org.eclipse.elk.graph.json.text.ide.contentassist, org.eclipse.elk.graph.json.text.ide.contentassist.antlr, diff --git a/plugins/org.eclipse.elk.graph.json.text.ui/.classpath b/plugins/org.eclipse.elk.graph.json.text.ui/.classpath index 8d26fa5987..a70cf0d9af 100644 --- a/plugins/org.eclipse.elk.graph.json.text.ui/.classpath +++ b/plugins/org.eclipse.elk.graph.json.text.ui/.classpath @@ -1,9 +1,9 @@ - - - - + - + + + + diff --git a/plugins/org.eclipse.elk.graph.json.text.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.graph.json.text.ui/META-INF/MANIFEST.MF index bb78bc9771..2310412cc6 100644 --- a/plugins/org.eclipse.elk.graph.json.text.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.graph.json.text.ui/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.elk.core, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.graph.json.text.ui.quickfix, org.eclipse.elk.graph.json.text.ui.contentassist, org.eclipse.elk.graph.json.text.ui.internal diff --git a/plugins/org.eclipse.elk.graph.json.text/.classpath b/plugins/org.eclipse.elk.graph.json.text/.classpath index 8d26fa5987..a70cf0d9af 100644 --- a/plugins/org.eclipse.elk.graph.json.text/.classpath +++ b/plugins/org.eclipse.elk.graph.json.text/.classpath @@ -1,9 +1,9 @@ - - - - + - + + + + diff --git a/plugins/org.eclipse.elk.graph.json.text/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.graph.json.text/META-INF/MANIFEST.MF index fef80d4230..3cf7cf2a90 100644 --- a/plugins/org.eclipse.elk.graph.json.text/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.graph.json.text/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.elk.core, org.eclipse.xtext.util, org.eclipse.xtend.lib;bundle-version="2.14.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.graph.json.text, org.eclipse.elk.graph.json.text.conversion, org.eclipse.elk.graph.json.text.formatting2, diff --git a/plugins/org.eclipse.elk.graph.json/.classpath b/plugins/org.eclipse.elk.graph.json/.classpath index 87e8cd6596..030fd399f0 100644 --- a/plugins/org.eclipse.elk.graph.json/.classpath +++ b/plugins/org.eclipse.elk.graph.json/.classpath @@ -1,8 +1,8 @@ - + - - + + diff --git a/plugins/org.eclipse.elk.graph.json/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.graph.json/META-INF/MANIFEST.MF index 65650bf153..2389ec0b84 100644 --- a/plugins/org.eclipse.elk.graph.json/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.graph.json/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, org.eclipse.xtend.lib.macro -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.elk.graph.json diff --git a/plugins/org.eclipse.elk.graph.text.ide/.classpath b/plugins/org.eclipse.elk.graph.text.ide/.classpath index 64c59ce2d8..a70cf0d9af 100644 --- a/plugins/org.eclipse.elk.graph.text.ide/.classpath +++ b/plugins/org.eclipse.elk.graph.text.ide/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/plugins/org.eclipse.elk.graph.text.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.graph.text.ide/META-INF/MANIFEST.MF index 0b5427cd98..06a8962f39 100644 --- a/plugins/org.eclipse.elk.graph.text.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.graph.text.ide/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.12.0", org.eclipse.elk.core, org.eclipse.elk.graph.text, org.antlr.runtime -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.graph.text.ide, org.eclipse.elk.graph.text.ide.contentassist, org.eclipse.elk.graph.text.ide.contentassist.antlr, diff --git a/plugins/org.eclipse.elk.graph.text.ui/.classpath b/plugins/org.eclipse.elk.graph.text.ui/.classpath index 9081d4f703..a70cf0d9af 100644 --- a/plugins/org.eclipse.elk.graph.text.ui/.classpath +++ b/plugins/org.eclipse.elk.graph.text.ui/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/plugins/org.eclipse.elk.graph.text.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.graph.text.ui/META-INF/MANIFEST.MF index 2ddb25e69e..673cc2a807 100644 --- a/plugins/org.eclipse.elk.graph.text.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.graph.text.ui/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.elk.core, org.eclipse.xtend.lib;resolution:=optional, org.eclipse.xtext.xbase.lib Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.graph.text.ui, org.eclipse.elk.graph.text.ui.contentassist, org.eclipse.elk.graph.text.ui.internal, diff --git a/plugins/org.eclipse.elk.graph.text/.classpath b/plugins/org.eclipse.elk.graph.text/.classpath index 9081d4f703..a70cf0d9af 100644 --- a/plugins/org.eclipse.elk.graph.text/.classpath +++ b/plugins/org.eclipse.elk.graph.text/.classpath @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/plugins/org.eclipse.elk.graph.text/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.graph.text/META-INF/MANIFEST.MF index 7b0c74e1fa..f86bec69d1 100644 --- a/plugins/org.eclipse.elk.graph.text/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.graph.text/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.elk.core, org.eclipse.xtext.util, org.eclipse.xtend.lib, org.antlr.runtime -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.elk.graph.text, org.eclipse.elk.graph.text.conversion, org.eclipse.elk.graph.text.formatting2, diff --git a/plugins/org.eclipse.elk.graph/.classpath b/plugins/org.eclipse.elk.graph/.classpath index 01836c4842..edc8895124 100644 --- a/plugins/org.eclipse.elk.graph/.classpath +++ b/plugins/org.eclipse.elk.graph/.classpath @@ -1,7 +1,7 @@ - + - + diff --git a/plugins/org.eclipse.elk.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.elk.graph/META-INF/MANIFEST.MF index 045f859a2c..46239e74c0 100644 --- a/plugins/org.eclipse.elk.graph/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.elk.graph/META-INF/MANIFEST.MF @@ -13,4 +13,4 @@ Export-Package: org.eclipse.elk.graph, Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.10.0";visibility:=reexport, com.google.guava Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/setups/EclipseLayoutKernel.setup b/setups/EclipseLayoutKernel.setup index a311129cc9..29408b9b36 100644 --- a/setups/EclipseLayoutKernel.setup +++ b/setups/EclipseLayoutKernel.setup @@ -281,8 +281,8 @@ + version="JavaSE-11" + location="${jre.location-11}"> Define the JRE needed to compile and run the Java projects of ${scope.project.label} - + diff --git a/test/org.eclipse.elk.alg.common.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.alg.common.test/META-INF/MANIFEST.MF index 2d01289a96..bd3ecad942 100644 --- a/test/org.eclipse.elk.alg.common.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.alg.common.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: ELK Common Algorithms Tests Bundle-SymbolicName: org.eclipse.elk.alg.common.test;singleton:=true Bundle-Version: 0.9.0.qualifier Automatic-Module-Name: org.eclipse.elk.alg.common.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Modeling Project Require-Bundle: com.google.guava, org.eclipse.elk.core, diff --git a/test/org.eclipse.elk.alg.disco.test/.classpath b/test/org.eclipse.elk.alg.disco.test/.classpath index eca7bdba8f..bf23501151 100644 --- a/test/org.eclipse.elk.alg.disco.test/.classpath +++ b/test/org.eclipse.elk.alg.disco.test/.classpath @@ -1,7 +1,11 @@ - + - + + + + + diff --git a/test/org.eclipse.elk.alg.disco.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.alg.disco.test/META-INF/MANIFEST.MF index 96a55106f7..9a1d4723da 100644 --- a/test/org.eclipse.elk.alg.disco.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.alg.disco.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ELK Layout DisCo Tests Bundle-SymbolicName: org.eclipse.elk.alg.disco.test;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava;bundle-version="18.0.0", org.eclipse.elk.core, org.eclipse.elk.graph, @@ -11,3 +11,4 @@ Require-Bundle: com.google.guava;bundle-version="18.0.0", org.eclipse.elk.alg.disco, org.junit;bundle-version="4.12.0" Bundle-Vendor: Eclipse Modeling Project +Automatic-Module-Name: org.eclipse.elk.alg.disco.test diff --git a/test/org.eclipse.elk.alg.force.test/.classpath b/test/org.eclipse.elk.alg.force.test/.classpath index eca7bdba8f..bf23501151 100644 --- a/test/org.eclipse.elk.alg.force.test/.classpath +++ b/test/org.eclipse.elk.alg.force.test/.classpath @@ -1,7 +1,11 @@ - + - + + + + + diff --git a/test/org.eclipse.elk.alg.force.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.alg.force.test/META-INF/MANIFEST.MF index adfd6f4166..6d12a80d1e 100644 --- a/test/org.eclipse.elk.alg.force.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.alg.force.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: ELK Force Tests Bundle-SymbolicName: org.eclipse.elk.alg.force.test;singleton:=true Bundle-Version: 0.9.0.qualifier Automatic-Module-Name: org.eclipse.elk.alg.force.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Modeling Project Require-Bundle: com.google.guava, org.eclipse.elk.core, diff --git a/test/org.eclipse.elk.alg.layered.test/.classpath b/test/org.eclipse.elk.alg.layered.test/.classpath index 3e5654f17e..a42a828e04 100644 --- a/test/org.eclipse.elk.alg.layered.test/.classpath +++ b/test/org.eclipse.elk.alg.layered.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/test/org.eclipse.elk.alg.layered.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.alg.layered.test/META-INF/MANIFEST.MF index 7a7f2ecf78..1c734f74f2 100644 --- a/test/org.eclipse.elk.alg.layered.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.alg.layered.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: ELK Layered Tests Bundle-SymbolicName: org.eclipse.elk.alg.layered.test;singleton:=true Bundle-Version: 0.9.0.qualifier Automatic-Module-Name: org.eclipse.elk.alg.layered.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Modeling Project Require-Bundle: com.google.guava, org.eclipse.elk.core, diff --git a/test/org.eclipse.elk.alg.radial.test/.classpath b/test/org.eclipse.elk.alg.radial.test/.classpath index cc5ee2dc8c..bf23501151 100644 --- a/test/org.eclipse.elk.alg.radial.test/.classpath +++ b/test/org.eclipse.elk.alg.radial.test/.classpath @@ -1,11 +1,11 @@ - + - + diff --git a/test/org.eclipse.elk.alg.radial.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.alg.radial.test/META-INF/MANIFEST.MF index 2517410c1e..75c8b24229 100644 --- a/test/org.eclipse.elk.alg.radial.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.alg.radial.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ELK Layout Radial Tests Bundle-SymbolicName: org.eclipse.elk.alg.radial.test;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava;bundle-version="18.0.0", org.eclipse.elk.core, org.eclipse.elk.graph, diff --git a/test/org.eclipse.elk.alg.rectpacking.test/.classpath b/test/org.eclipse.elk.alg.rectpacking.test/.classpath index 3e5654f17e..a42a828e04 100644 --- a/test/org.eclipse.elk.alg.rectpacking.test/.classpath +++ b/test/org.eclipse.elk.alg.rectpacking.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/test/org.eclipse.elk.alg.rectpacking.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.alg.rectpacking.test/META-INF/MANIFEST.MF index 6390011552..63aae0a632 100644 --- a/test/org.eclipse.elk.alg.rectpacking.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.alg.rectpacking.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: ELK Rectpacking Algorithms Tests Bundle-SymbolicName: org.eclipse.elk.alg.rectpacking.test;singleton:=true Bundle-Version: 0.9.0.qualifier Automatic-Module-Name: org.eclipse.elk.alg.rectpacking.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Modeling Project Require-Bundle: com.google.guava, org.eclipse.elk.core, diff --git a/test/org.eclipse.elk.alg.spore.test/.classpath b/test/org.eclipse.elk.alg.spore.test/.classpath index eca7bdba8f..bf23501151 100644 --- a/test/org.eclipse.elk.alg.spore.test/.classpath +++ b/test/org.eclipse.elk.alg.spore.test/.classpath @@ -1,7 +1,11 @@ - + - + + + + + diff --git a/test/org.eclipse.elk.alg.spore.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.alg.spore.test/META-INF/MANIFEST.MF index ebf8ac5ef8..e23ded6056 100644 --- a/test/org.eclipse.elk.alg.spore.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.alg.spore.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ELK SPOrE Tests Bundle-SymbolicName: org.eclipse.elk.alg.spore.test;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Modeling Project Require-Bundle: com.google.guava;bundle-version="18.0.0", org.eclipse.elk.core, diff --git a/test/org.eclipse.elk.alg.test/.classpath b/test/org.eclipse.elk.alg.test/.classpath index eca7bdba8f..bf23501151 100644 --- a/test/org.eclipse.elk.alg.test/.classpath +++ b/test/org.eclipse.elk.alg.test/.classpath @@ -1,7 +1,11 @@ - + - + + + + + diff --git a/test/org.eclipse.elk.alg.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.alg.test/META-INF/MANIFEST.MF index 551009a118..0f33a9ec08 100644 --- a/test/org.eclipse.elk.alg.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.alg.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ELK Layout Algorithm Tests Bundle-SymbolicName: org.eclipse.elk.alg.test;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava, org.eclipse.elk.core, org.eclipse.elk.core.debug.grandom, diff --git a/test/org.eclipse.elk.alg.topdown.test/.classpath b/test/org.eclipse.elk.alg.topdown.test/.classpath index 3e5654f17e..a42a828e04 100644 --- a/test/org.eclipse.elk.alg.topdown.test/.classpath +++ b/test/org.eclipse.elk.alg.topdown.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/test/org.eclipse.elk.alg.topdown.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.alg.topdown.test/META-INF/MANIFEST.MF index 3dd58a4a9d..4f73d22af5 100644 --- a/test/org.eclipse.elk.alg.topdown.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.alg.topdown.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: ELK Topdown Tests Bundle-SymbolicName: org.eclipse.elk.alg.topdown.test;singleton:=true Bundle-Version: 0.9.0.qualifier Automatic-Module-Name: org.eclipse.elk.alg.topdown.test -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Modeling Project Require-Bundle: com.google.guava, org.eclipse.elk.core, diff --git a/test/org.eclipse.elk.core.test/.classpath b/test/org.eclipse.elk.core.test/.classpath index eca7bdba8f..bf23501151 100644 --- a/test/org.eclipse.elk.core.test/.classpath +++ b/test/org.eclipse.elk.core.test/.classpath @@ -1,7 +1,11 @@ - + - + + + + + diff --git a/test/org.eclipse.elk.core.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.core.test/META-INF/MANIFEST.MF index 079e6fa392..1e961000ed 100644 --- a/test/org.eclipse.elk.core.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.core.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ELK Core Tests Bundle-SymbolicName: org.eclipse.elk.core.test;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava, org.junit;bundle-version="4.12.0", org.eclipse.elk.core, diff --git a/test/org.eclipse.elk.graph.json.test/.classpath b/test/org.eclipse.elk.graph.json.test/.classpath index 428337e560..6849aa2d4a 100644 --- a/test/org.eclipse.elk.graph.json.test/.classpath +++ b/test/org.eclipse.elk.graph.json.test/.classpath @@ -1,8 +1,16 @@ - + - - + + + + + + + + + + diff --git a/test/org.eclipse.elk.graph.json.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.graph.json.test/META-INF/MANIFEST.MF index 7f5fccabef..19d8bf5893 100644 --- a/test/org.eclipse.elk.graph.json.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.graph.json.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ELK Graph JSON Tests Bundle-SymbolicName: org.eclipse.elk.graph.json.test;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Modeling Project Require-Bundle: com.google.guava, com.google.gson;bundle-version="2.8.2", diff --git a/test/org.eclipse.elk.graph.test/.classpath b/test/org.eclipse.elk.graph.test/.classpath index eca7bdba8f..bf23501151 100644 --- a/test/org.eclipse.elk.graph.test/.classpath +++ b/test/org.eclipse.elk.graph.test/.classpath @@ -1,7 +1,11 @@ - + - + + + + + diff --git a/test/org.eclipse.elk.graph.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.graph.test/META-INF/MANIFEST.MF index 3d73c3238d..05f1784819 100644 --- a/test/org.eclipse.elk.graph.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.graph.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ELK Graph Model Tests Bundle-SymbolicName: org.eclipse.elk.graph.test;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Modeling Project Require-Bundle: com.google.guava, org.eclipse.elk.graph, diff --git a/test/org.eclipse.elk.shared.test/.classpath b/test/org.eclipse.elk.shared.test/.classpath index eca7bdba8f..bf23501151 100644 --- a/test/org.eclipse.elk.shared.test/.classpath +++ b/test/org.eclipse.elk.shared.test/.classpath @@ -1,7 +1,11 @@ - + - + + + + + diff --git a/test/org.eclipse.elk.shared.test/META-INF/MANIFEST.MF b/test/org.eclipse.elk.shared.test/META-INF/MANIFEST.MF index f3949ae8b0..857e82e9fc 100644 --- a/test/org.eclipse.elk.shared.test/META-INF/MANIFEST.MF +++ b/test/org.eclipse.elk.shared.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ELK Shared Tests Bundle-SymbolicName: org.eclipse.elk.shared.test;singleton:=true Bundle-Version: 0.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.google.guava, org.junit;bundle-version="4.12.0", org.eclipse.elk.core,