diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 320ec9943..974a3c0e2 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho tycho-build - 2.7.0 + 2.7.3 \ No newline at end of file diff --git a/commons/plugins/gexpressions/org.eclipse.gemoc.gexpressions.xtext/META-INF/MANIFEST.MF b/commons/plugins/gexpressions/org.eclipse.gemoc.gexpressions.xtext/META-INF/MANIFEST.MF index e86289bc0..7b39afdbf 100644 --- a/commons/plugins/gexpressions/org.eclipse.gemoc.gexpressions.xtext/META-INF/MANIFEST.MF +++ b/commons/plugins/gexpressions/org.eclipse.gemoc.gexpressions.xtext/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-SymbolicName: org.eclipse.gemoc.gexpressions.xtext; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport, - org.eclipse.xtext.generator;resolution:=optional, + org.eclipse.xtext.xtext.generator;resolution:=optional, org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional, org.eclipse.emf.codegen.ecore;resolution:=optional, org.eclipse.emf.mwe.utils;resolution:=optional, diff --git a/commons/pomfirst/org.eclipse.gemoc.commons.eclipse.messagingsystem.api/pom.xml b/commons/pomfirst/org.eclipse.gemoc.commons.eclipse.messagingsystem.api/pom.xml index 4962e08cc..fffa9bfd9 100644 --- a/commons/pomfirst/org.eclipse.gemoc.commons.eclipse.messagingsystem.api/pom.xml +++ b/commons/pomfirst/org.eclipse.gemoc.commons.eclipse.messagingsystem.api/pom.xml @@ -13,7 +13,7 @@ ../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/commons/pomfirst/org.eclipse.gemoc.commons.eclipse/pom.xml b/commons/pomfirst/org.eclipse.gemoc.commons.eclipse/pom.xml index 4c12b1d06..88ae6aa5a 100644 --- a/commons/pomfirst/org.eclipse.gemoc.commons.eclipse/pom.xml +++ b/commons/pomfirst/org.eclipse.gemoc.commons.eclipse/pom.xml @@ -13,7 +13,7 @@ ../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/commons/pomfirst/org.eclipse.gemoc.dsl.model/pom.xml b/commons/pomfirst/org.eclipse.gemoc.dsl.model/pom.xml index e6bc5de6e..bb20754fb 100644 --- a/commons/pomfirst/org.eclipse.gemoc.dsl.model/pom.xml +++ b/commons/pomfirst/org.eclipse.gemoc.dsl.model/pom.xml @@ -13,7 +13,7 @@ ../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/commons/releng/org.eclipse.gemoc.commons.feature/feature.xml b/commons/releng/org.eclipse.gemoc.commons.feature/feature.xml index 0c8b2e208..26fda4d2c 100644 --- a/commons/releng/org.eclipse.gemoc.commons.feature/feature.xml +++ b/commons/releng/org.eclipse.gemoc.commons.feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/pomfirst/pom.xml b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/pomfirst/pom.xml index 9a6c5648c..c531ead88 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/pomfirst/pom.xml +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.debugger/pomfirst/pom.xml @@ -13,7 +13,7 @@ ../../../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.classpath b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.classpath index 8ec67028c..4b77bce22 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.classpath +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.settings/org.eclipse.jdt.core.prefs index 0c68a61dc..7adc0fb9a 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.settings/org.eclipse.jdt.core.prefs +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.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.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF index fd44719d5..2b7cb1328 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/META-INF/MANIFEST.MF @@ -32,7 +32,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.ui.workbench, org.eclipse.ui.ide;bundle-version="3.14.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.gemoc.executionframework.engine.ui, org.eclipse.gemoc.executionframework.engine.ui.launcher, org.eclipse.gemoc.executionframework.engine.ui.launcher.tabs, diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.classpath b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.classpath index 96d4ad218..f95dd5405 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.classpath +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.settings/org.eclipse.jdt.core.prefs index 320a2c21f..631eb5870 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.settings/org.eclipse.jdt.core.prefs +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/.settings/org.eclipse.jdt.core.prefs @@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -63,6 +64,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -92,8 +94,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +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=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -101,17 +105,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=0 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=0 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=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=0 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 @@ -195,11 +202,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 @@ -229,6 +237,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser 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_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 @@ -253,13 +263,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 @@ -306,6 +320,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_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 @@ -342,9 +358,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 @@ -370,6 +389,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_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=false diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF index addc4ea55..6b31092fa 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.dsl.debug.ide, org.eclipse.gemoc.executionframework.engine.model;visibility:=reexport Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.gemoc.executionframework.engine, org.eclipse.gemoc.executionframework.engine.commons, org.eclipse.gemoc.executionframework.engine.commons.adapters, diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/.classpath b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/.classpath index 2869279ea..4a00becd8 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/.classpath +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..c9545f06a --- /dev/null +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +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 diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/META-INF/MANIFEST.MF index b8c154b6f..c7d55ecd3 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.gemoc.executionframework.event.model;bundle-version= org.eclipse.gemoc.executionframework.engine, com.google.guava Bundle-ManifestVersion: 2 -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: org.eclipse.gemoc.executionframework.event.manager Bundle-Vendor: Eclipse GEMOC Project diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/src/org/eclipse/gemoc/executionframework/event/manager/SimpleImplementationRelationship.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/src/org/eclipse/gemoc/executionframework/event/manager/SimpleImplementationRelationship.java index fdc7d0758..e6611d0ef 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/src/org/eclipse/gemoc/executionframework/event/manager/SimpleImplementationRelationship.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.event.manager/src/org/eclipse/gemoc/executionframework/event/manager/SimpleImplementationRelationship.java @@ -8,14 +8,13 @@ import java.util.function.Function; import java.util.stream.Collectors; +import org.eclipse.gemoc.executionframework.behavioralinterface.behavioralInterface.BehavioralInterface; +import org.eclipse.gemoc.executionframework.behavioralinterface.behavioralInterface.Event; +import org.eclipse.gemoc.executionframework.behavioralinterface.behavioralInterface.EventParameter; import org.eclipse.gemoc.executionframework.event.model.event.EventFactory; import org.eclipse.gemoc.executionframework.event.model.event.EventOccurrence; import org.eclipse.gemoc.executionframework.event.model.event.EventOccurrenceArgument; import org.eclipse.gemoc.executionframework.event.model.event.EventOccurrenceType; -import org.eclipse.gemoc.executionframework.behavioralinterface.behavioralInterface.BehavioralInterface; -import org.eclipse.gemoc.executionframework.behavioralinterface.behavioralInterface.BehavioralInterfacePackage; -import org.eclipse.gemoc.executionframework.behavioralinterface.behavioralInterface.Event; -import org.eclipse.gemoc.executionframework.behavioralinterface.behavioralInterface.EventParameter; public class SimpleImplementationRelationship implements IImplementationRelationship { diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java index 9ac92c18c..29e15bc31 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/debug/DebugSessionFactory.java @@ -32,7 +32,7 @@ import org.eclipse.sirius.common.tools.api.util.SiriusCrossReferenceAdapter; import org.eclipse.sirius.tools.internal.resource.ResourceSetUtil; import org.eclipse.sirius.viewpoint.DAnalysis; -import org.eclipse.sirius.viewpoint.SiriusPlugin; +import org.eclipse.sirius.tools.api.SiriusPlugin; import org.eclipse.sirius.viewpoint.ViewpointFactory; /** diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java index 34ff4d35e..ad5b2ecf6 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.extensions.sirius/src/org/eclipse/gemoc/executionframework/extensions/sirius/modelloader/DefaultModelLoader.java @@ -55,7 +55,7 @@ import org.eclipse.sirius.business.internal.session.danalysis.DAnalysisSessionImpl; import org.eclipse.sirius.common.tools.api.resource.ResourceSetFactory; import org.eclipse.sirius.diagram.DSemanticDiagram; -import org.eclipse.sirius.diagram.DiagramPlugin; +import org.eclipse.sirius.diagram.tools.api.DiagramPlugin; import org.eclipse.sirius.diagram.description.DiagramExtensionDescription; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.tools.api.command.ChangeLayerActivationCommand; diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.classpath b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.classpath index 8ec67028c..4b77bce22 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.classpath +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.settings/org.eclipse.jdt.core.prefs b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.settings/org.eclipse.jdt.core.prefs index 320a2c21f..631eb5870 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.settings/org.eclipse.jdt.core.prefs +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/.settings/org.eclipse.jdt.core.prefs @@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -63,6 +64,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -92,8 +94,10 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +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=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -101,17 +105,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=0 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=0 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=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=0 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 @@ -195,11 +202,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 @@ -229,6 +237,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser 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_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 @@ -253,13 +263,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 @@ -306,6 +320,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_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 @@ -342,9 +358,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 @@ -370,6 +389,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_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=false diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF index fd43e81ac..a8b3c9965 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.ui/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.gemoc.xdsmlframework.api, org.eclipse.gemoc.executionframework.debugger, org.eclipse.gemoc.commons.eclipse.messagingsystem.api Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse GEMOC Project Export-Package: org.eclipse.gemoc.executionframework.ui, org.eclipse.gemoc.executionframework.ui.utils, diff --git a/framework/framework_commons/pomfirst/org.eclipse.gemoc.xdsmlframework.api/pom.xml b/framework/framework_commons/pomfirst/org.eclipse.gemoc.xdsmlframework.api/pom.xml index 15a0b9770..c01b0b086 100644 --- a/framework/framework_commons/pomfirst/org.eclipse.gemoc.xdsmlframework.api/pom.xml +++ b/framework/framework_commons/pomfirst/org.eclipse.gemoc.xdsmlframework.api/pom.xml @@ -14,7 +14,7 @@ ../../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF index 6f3d2400b..2226e1ddf 100644 --- a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF +++ b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/META-INF/MANIFEST.MF @@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.gemoc.xdsmlframework.test.lib Bundle-Version: 4.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.12.0", - org.eclipse.xtext.junit4;bundle-version="2.10.0", org.eclipse.xtext.xbase.lib;bundle-version="2.10.0", fr.inria.diverse.melange.ui;bundle-version="0.2.0", org.eclipse.debug.ui;bundle-version="3.11.202", @@ -20,7 +19,10 @@ Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.gemoc.trace.gemoc.generator;bundle-version="2.4.0", org.eclipse.gemoc.trace.gemoc;bundle-version="2.4.0", org.eclipse.gemoc.xdsmlframework.ide.ui;bundle-version="3.0.0", - org.eclipse.swtbot.go;bundle-version="2.7.0" + org.eclipse.swtbot.go;bundle-version="2.7.0", + org.eclipse.xtext.testing;bundle-version="2.27.0", + org.eclipse.xtext.ui.testing;bundle-version="2.27.0" Export-Package: org.eclipse.gemoc.xdsmlframework.test.lib Automatic-Module-Name: org.eclipse.gemoc.xdsmlframework.test.lib Bundle-Vendor: Eclipse GEMOC Project +Import-Package: org.slf4j diff --git a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java index 429b3bccd..86186598b 100644 --- a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java +++ b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/MelangeUiInjectorProvider.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.gemoc.xdsmlframework.test.lib; -import org.eclipse.xtext.junit4.IInjectorProvider; +import org.eclipse.xtext.testing.IInjectorProvider; import com.google.inject.Injector; diff --git a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/MelangeWorkspaceTestHelper.xtend b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/MelangeWorkspaceTestHelper.xtend index 679ddf6f3..f1acb8b49 100644 --- a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/MelangeWorkspaceTestHelper.xtend +++ b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/MelangeWorkspaceTestHelper.xtend @@ -50,8 +50,8 @@ import org.eclipse.ui.internal.wizards.datatransfer.ZipLeveledStructureProvider import org.eclipse.ui.part.FileEditorInput import org.eclipse.ui.views.contentoutline.IContentOutlinePage import org.eclipse.ui.wizards.datatransfer.ImportOperation -import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil -import org.eclipse.xtext.junit4.ui.util.JavaProjectSetupUtil +import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil +import org.eclipse.xtext.ui.testing.util.JavaProjectSetupUtil import org.eclipse.xtext.resource.DerivedStateAwareResource import org.eclipse.xtext.ui.XtextProjectHelper import org.eclipse.xtext.ui.editor.XtextEditor diff --git a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend index 038934fef..c0382b213 100644 --- a/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend +++ b/framework/xdsml_framework/tests/org.eclipse.gemoc.xdsmlframework.test.lib/src/org/eclipse/gemoc/xdsmlframework/test/lib/WorkspaceTestHelper.xtend @@ -54,10 +54,12 @@ import org.eclipse.ui.dialogs.IOverwriteQuery import org.eclipse.ui.handlers.IHandlerService import org.eclipse.ui.internal.wizards.datatransfer.ZipLeveledStructureProvider import org.eclipse.ui.wizards.datatransfer.ImportOperation -import org.eclipse.xtext.junit4.ui.util.IResourcesSetupUtil -import org.eclipse.xtext.junit4.ui.util.JavaProjectSetupUtil +import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil +import org.eclipse.xtext.ui.testing.util.JavaProjectSetupUtil import org.junit.Assert import org.osgi.framework.Bundle +import java.nio.file.Files +import java.util.Comparator /** * Class containing helper methods for testing a workspace in a GEMOC Language workbench @@ -422,7 +424,7 @@ class WorkspaceTestHelper { } static def void waitForJobs() { - val delay = 500; + val delay = 1000; var retry = 600 if(!Job.getJobManager().isIdle()) { delay(delay); @@ -444,7 +446,7 @@ class WorkspaceTestHelper { job.name.contains("Compacting resource model") )) { println("[waitForJobs] CANCELLING job "+job.name+ " (rule="+job.rule+")") - + job.cancel } } val rules = jobs.filter[j | j.rule !== null].map[j | j.rule] @@ -461,6 +463,8 @@ class WorkspaceTestHelper { } } } + + static var closed = false; static def void delay(long waitTimeMillis) { val Display display = Display.getCurrent(); @@ -510,4 +514,27 @@ class WorkspaceTestHelper { } } } + + def static forceCleanPreviousWorkspaceContent(){ + + IResourcesSetupUtil::cleanWorkspace + + val dirName = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString() + System.out.println("workspace content ("+dirName + ")") + val ArrayList dirsToDelete = newArrayList + + Files.list(new File(dirName).toPath()).forEach([path | + System.out.println(" " +path) + if(!path.endsWith(".metadata")) { + dirsToDelete.add(path) + } + ]) + + + dirsToDelete.forEach[ dir | + System.out.println("Deleting " +dir + "...") + Files.walk(dir).sorted(Comparator.reverseOrder()).map[ p | p.toFile].forEach[ f | f.delete] + ] + + } } diff --git a/pom.xml b/pom.xml index 0db156578..5247ec2d6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.eclipse.gemoc.gemoc-studio gemoc_studio-eclipse-bom - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT ../gemoc-studio/gemoc_studio/plugins/gemoc_studio-eclipse-bom @@ -154,7 +154,7 @@ org.eclipse.gemoc.gemoc-studio.bundle org.eclipse.gemoc.gemoc_studio.targetplatform - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT gemoc_studio diff --git a/pomfirst/pom.xml b/pomfirst/pom.xml index 900f79557..88684bcc1 100644 --- a/pomfirst/pom.xml +++ b/pomfirst/pom.xml @@ -7,7 +7,7 @@ org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT pom https://www.eclipse.org/gemoc/ @@ -121,7 +121,7 @@ org.eclipse.gemoc.gemoc-studio gemoc-studio-bom - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT import pom diff --git a/protocols/engine_addon_protocol/pomfirst/org.eclipse.gemoc.protocols.eaop.api/pom.xml b/protocols/engine_addon_protocol/pomfirst/org.eclipse.gemoc.protocols.eaop.api/pom.xml index 908142e54..bfd7a4b73 100644 --- a/protocols/engine_addon_protocol/pomfirst/org.eclipse.gemoc.protocols.eaop.api/pom.xml +++ b/protocols/engine_addon_protocol/pomfirst/org.eclipse.gemoc.protocols.eaop.api/pom.xml @@ -13,7 +13,7 @@ ../../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/releng/org.eclipse.gemoc.modeldebugging.feature/feature.xml b/releng/org.eclipse.gemoc.modeldebugging.feature/feature.xml index dd58acd63..f7c01c6e9 100644 --- a/releng/org.eclipse.gemoc.modeldebugging.feature/feature.xml +++ b/releng/org.eclipse.gemoc.modeldebugging.feature/feature.xml @@ -12,7 +12,7 @@ diff --git a/simulationmodelanimation/pom.xml b/simulationmodelanimation/pom.xml index 46e5b5bae..72f642487 100644 --- a/simulationmodelanimation/pom.xml +++ b/simulationmodelanimation/pom.xml @@ -27,7 +27,7 @@ - 2.7.0 + 2.7.3 scm:git:https://github.com/SiriusLab/ModelDebugging.git diff --git a/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug.edit/pom.xml b/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug.edit/pom.xml index 911e482b1..1a110b28b 100644 --- a/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug.edit/pom.xml +++ b/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug.edit/pom.xml @@ -12,7 +12,7 @@ /../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug.ide/pom.xml b/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug.ide/pom.xml index 19e7f6962..8726cea1e 100644 --- a/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug.ide/pom.xml +++ b/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug.ide/pom.xml @@ -12,7 +12,7 @@ ../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug/pom.xml b/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug/pom.xml index b570604d3..2cef20c8a 100644 --- a/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug/pom.xml +++ b/simulationmodelanimation/pomfirst/org.eclipse.gemoc.dsl.debug/pom.xml @@ -14,7 +14,7 @@ ../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/trace/commons/pomfirst/org.eclipse.gemoc.trace.commons.model/pom.xml b/trace/commons/pomfirst/org.eclipse.gemoc.trace.commons.model/pom.xml index 75724587c..229c7932c 100644 --- a/trace/commons/pomfirst/org.eclipse.gemoc.trace.commons.model/pom.xml +++ b/trace/commons/pomfirst/org.eclipse.gemoc.trace.commons.model/pom.xml @@ -12,7 +12,7 @@ ../../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/trace/commons/pomfirst/org.eclipse.gemoc.trace.commons/pom.xml b/trace/commons/pomfirst/org.eclipse.gemoc.trace.commons/pom.xml index 5f00cf17b..50443ce9d 100644 --- a/trace/commons/pomfirst/org.eclipse.gemoc.trace.commons/pom.xml +++ b/trace/commons/pomfirst/org.eclipse.gemoc.trace.commons/pom.xml @@ -14,7 +14,7 @@ ../../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/trace/commons/pomfirst/org.eclipse.gemoc.trace.gemoc.api/pom.xml b/trace/commons/pomfirst/org.eclipse.gemoc.trace.gemoc.api/pom.xml index 6985bb069..213c60c75 100644 --- a/trace/commons/pomfirst/org.eclipse.gemoc.trace.gemoc.api/pom.xml +++ b/trace/commons/pomfirst/org.eclipse.gemoc.trace.gemoc.api/pom.xml @@ -12,7 +12,7 @@ ../../../../pomfirst org.eclipse.gemoc.gemoc-studio-modeldebugging org.eclipse.gemoc.modeldebugging.root - 3.5.0-SNAPSHOT + 3.6.0-SNAPSHOT diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend index bb339286f..19e3646ea 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/GenericEngineTraceAddonGenerator.xtend @@ -210,7 +210,7 @@ class GenericEngineTraceAddonGenerator { ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.trace.commons") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.xdsmlframework.api") ManifestUtil.addToPluginManifest(project, m, "org.eclipse.gemoc.trace.commons.model") - ManifestUtil.setRequiredExecutionEnvironmentToPluginManifest(project, m, "JavaSE-1.8") + ManifestUtil.setRequiredExecutionEnvironmentToPluginManifest(project, m, "JavaSE-11") } private def void addExtensionPoint() { diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend index 7db5b7306..4a9529ae5 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/codegen/StateManagerGeneratorJava.xtend @@ -167,7 +167,6 @@ class StateManagerGeneratorJava { return result; } - @SuppressWarnings("unchecked") private void restoreStateExecute(«stateFQN» state) { for («valueFQN» value : state.getValues()) { «FOR p : traceability.allMutableProperties.sortBy[getFQN] SEPARATOR "else"» diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/PluginProjectHelper.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/PluginProjectHelper.xtend index 7fe56338e..e57afb91d 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/PluginProjectHelper.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/PluginProjectHelper.xtend @@ -98,7 +98,7 @@ public class PluginProjectHelper { } classpathEntries.add(JavaCore.newContainerEntry(new Path( - "org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"))); + "org.eclipse.jdt.launching.JRE_CONTAINER"))); classpathEntries.add(JavaCore.newContainerEntry(new Path("org.eclipse.pde.core.requiredPlugins"))); val IClasspathEntry[] classPathEntriesArray = newArrayOfSize(classpathEntries.size()) diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend index 43debba73..e37a62226 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc.generator/src/org/eclipse/gemoc/trace/gemoc/generator/util/StandaloneEMFProjectGenerator.xtend @@ -289,8 +289,10 @@ public class StandaloneEMFProjectGenerator { return GenJDKLevel.JDK60_LITERAL; } else if ("1.7".equals(complianceLevel)) { return GenJDKLevel.JDK70_LITERAL; - } else { + } else if ("1.8".equals(complianceLevel)) { return GenJDKLevel.JDK80_LITERAL; + } else { + return GenJDKLevel.JDK110_LITERAL; } } diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.classpath b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.classpath index 0805795ce..44e0ca59e 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.classpath +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.classpath @@ -1,8 +1,8 @@ - - + + diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.settings/org.eclipse.jdt.core.prefs b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.settings/org.eclipse.jdt.core.prefs index 0c68a61dc..7adc0fb9a 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.settings/org.eclipse.jdt.core.prefs +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.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.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/META-INF/MANIFEST.MF b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/META-INF/MANIFEST.MF index 348d80026..e91433b66 100644 --- a/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/META-INF/MANIFEST.MF +++ b/trace/generator/plugins/org.eclipse.gemoc.trace.gemoc/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.gemoc.trace.gemoc Bundle-SymbolicName: org.eclipse.gemoc.trace.gemoc;singleton:=true Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.gemoc.timeline;bundle-version="1.0.0", org.eclipse.gemoc.xdsmlframework.api;bundle-version="0.1.0", org.eclipse.xtend.lib,