Merge branch 'neon' of https://git.eclipse.org/r/chess/chess.git into

neon Conflicts: plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2 plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend Change-Id: I5315768ba10a0377a053fa5244c92cb75ed528bb

Merge branch 'neon' of https://git.eclipse.org/r/chess/chess.git into
neon Conflicts: plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2 plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend Change-Id: I5315768ba10a0377a053fa5244c92cb75ed528bb
87113245 · Alberto Debiasi · 7d0594d3 · 24d14873 · 87113245 · 87113245
Commit 87113245 authored 4 years ago by Alberto Debiasi
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessGenericDiagnostician.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessGenericDiagnostician.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessValidatorAdapter.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/command/util/ChessValidatorAdapter.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/AV_03.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/AV_03.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/ArincProc_01.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/ArincProc_01.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_01.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_01.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_02.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_02.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_03.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/Connector_03.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_01.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_01.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_02.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_02.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_03.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_03.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_04.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_04.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_05.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_05.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_06.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/DV_06.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_01.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_01.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02_1.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_02_1.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_03.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_03.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_04.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_04.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_20.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_20.java
--- a/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_30.java
+++ b/plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/constraints/EFVRT_30.java