From e77bb34fe73f0714e7c95ba52970a94c6f0b49d7 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 11 Mar 2024 08:52:51 +0100 Subject: [PATCH 01/11] grammarcells: support CellModel_ReadOnlyModelAccessor in optional cells --- CHANGELOG.md | 6 + .../grammarcells/sandboxlang/editor.mps | 79 ++++++ .../grammarcells/sandboxlang/structure.mps | 15 ++ .../generator/template/main@generator.mps | 241 ++++++++++++++++-- .../models/generatorutils.mps | 36 ++- .../mpsutil/grammarcells/tests@tests.mps | 56 ++++ 6 files changed, 400 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d80869ce..811eb3c66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project are documented in this file. Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month. +## March 2024 + +### Added + +- com.mbeddr.mpsutil.grammarcells: Read-only model accessory cells can now also be used in places where constant cells are supported. + ## February 2024 ### Changed diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps index b5ceb661c..3c121a279 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps @@ -17,6 +17,9 @@ + + + @@ -112,12 +115,19 @@ + + + + + + + @@ -128,6 +138,7 @@ + @@ -2908,5 +2919,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps index c39679d3b..cb266bb02 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps @@ -1059,5 +1059,20 @@ + + + + + + + + + + + + + + + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps index 2bd0bd1f7..6aa409bfb 100755 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps @@ -5158,6 +5158,20 @@ + + + + + + + + + + + + + + @@ -13250,7 +13264,6 @@ - @@ -15776,7 +15789,6 @@ - @@ -15894,10 +15906,26 @@ - + + + + + + + + + + + + + + + + + + - @@ -16393,6 +16421,23 @@ + + + + + + + + + + + + + + + + + @@ -19814,7 +19859,6 @@ - @@ -21283,6 +21327,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21866,6 +21959,24 @@ + + + + + + + + + + + + + + + + + + @@ -21981,22 +22092,6 @@ - - - - - - - - - - - - - - - - @@ -30035,5 +30130,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps index 47a0126c6..7a4b934b9 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/generatorutils.mps @@ -567,24 +567,36 @@ - - - + + + - - - + + + - - - + + + + + + + + + + - - - + + + + + + + + diff --git a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps index 42925fb1a..7dc9c0c8c 100644 --- a/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps +++ b/code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/tests@tests.mps @@ -58,6 +58,7 @@ + @@ -281,6 +282,9 @@ + + + @@ -4147,5 +4151,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 646c102c237478dc7fd9bb6c44992278999b49a8 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 12 Mar 2024 09:06:16 +0100 Subject: [PATCH 02/11] Fix the broken model after merging --- .../generator/template/main@generator.mps | 200 +++++++++--------- 1 file changed, 104 insertions(+), 96 deletions(-) diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps index 7347de223..db70a2a8d 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps @@ -1,12 +1,13 @@ + - + @@ -49,6 +50,7 @@ + @@ -56,12 +58,12 @@ + - @@ -89,7 +91,7 @@ - + @@ -130,7 +132,7 @@ - + @@ -144,7 +146,7 @@ - + @@ -169,11 +171,11 @@ - + - + @@ -219,7 +221,7 @@ - + @@ -342,7 +344,7 @@ - + @@ -372,7 +374,7 @@ - + @@ -452,7 +454,7 @@ - + @@ -470,7 +472,7 @@ - + @@ -502,7 +504,7 @@ - + @@ -531,7 +533,6 @@ - @@ -590,7 +591,7 @@ - + @@ -802,7 +803,7 @@ - + @@ -850,6 +851,7 @@ + @@ -1082,14 +1084,14 @@ - + - + - + @@ -1302,14 +1304,14 @@ - + - + - + @@ -1392,14 +1394,14 @@ - + - + - + @@ -1905,7 +1907,7 @@ - + @@ -1915,9 +1917,9 @@ - + - + @@ -8997,8 +8999,8 @@ - + @@ -9326,7 +9328,7 @@ - + @@ -9345,7 +9347,7 @@ - + @@ -9404,7 +9406,7 @@ - + @@ -9415,7 +9417,7 @@ - + @@ -9560,9 +9562,9 @@ - + - + @@ -9614,7 +9616,7 @@ - + @@ -9625,7 +9627,7 @@ - + @@ -9656,7 +9658,7 @@ - + @@ -10031,7 +10033,7 @@ - + @@ -10047,7 +10049,7 @@ - + @@ -10173,7 +10175,7 @@ - + @@ -10195,7 +10197,7 @@ - + @@ -10319,10 +10321,10 @@ - + - + @@ -12910,14 +12912,14 @@ - + - + - + @@ -12962,14 +12964,14 @@ - + - + - + @@ -13131,14 +13133,14 @@ - + - + - + @@ -13183,14 +13185,14 @@ - + - + - + @@ -13304,14 +13306,14 @@ - + - + - + @@ -13335,14 +13337,14 @@ - + - + - + @@ -13547,14 +13549,14 @@ - + - + - + @@ -18259,14 +18261,14 @@ - + - + - + @@ -19772,6 +19774,13 @@ + + + + + + + @@ -21304,15 +21313,15 @@ - + - + - + @@ -21657,15 +21666,15 @@ - + - + - + @@ -22970,14 +22979,14 @@ - + - + - + @@ -23441,7 +23450,7 @@ - + @@ -23455,9 +23464,9 @@ - + - + @@ -23498,7 +23507,7 @@ - + @@ -23512,9 +23521,9 @@ - + - + @@ -23569,7 +23578,7 @@ - + @@ -23583,9 +23592,9 @@ - + - + @@ -23610,7 +23619,7 @@ - + @@ -23624,9 +23633,9 @@ - + - + @@ -24301,7 +24310,7 @@ - + @@ -24315,9 +24324,9 @@ - + - + @@ -24368,7 +24377,7 @@ - + @@ -24382,9 +24391,9 @@ - + - + @@ -30228,4 +30237,3 @@ - From 406b8277f342277430522a5fe865918aff0d9353 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 12 Mar 2024 13:43:32 +0100 Subject: [PATCH 03/11] build:ThirdParty: added extract jar from idea layout - added back .app jar - added com.intellij pluginID to overcome classloading issues third.party.test: added mock to check for classloading issues --- code/.mps/modules.xml | 1 + .../models/de.itemis.mps.extensions.build.mps | 89 +++++++++++++++++-- .../MPS.ThirdParty/MPS.ThirdParty.msd | 4 + .../models/third.party.usage.test.mdl.mps | 42 +++++++++ .../third.party.usage.test.msd | 27 ++++++ 5 files changed, 157 insertions(+), 6 deletions(-) create mode 100644 code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps create mode 100644 code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml index e1e53bec5..07f68beee 100644 --- a/code/.mps/modules.xml +++ b/code/.mps/modules.xml @@ -192,6 +192,7 @@ + diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 09d5c3e53..3dce7fc20 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -107,6 +107,9 @@ + + + @@ -201,6 +204,7 @@ + @@ -912,10 +916,10 @@ - + @@ -955,6 +959,19 @@ + + + + + + + + + + + + + @@ -13439,11 +13456,6 @@ - - - - - @@ -13484,6 +13496,11 @@ + + + + + @@ -15250,6 +15267,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -20241,6 +20305,16 @@ + + + + + + + + + + @@ -20470,6 +20544,9 @@ + + + diff --git a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd index 88c291b1f..3ed2010f6 100644 --- a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd +++ b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd @@ -9,7 +9,11 @@ + + + + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) diff --git a/code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps b/code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps new file mode 100644 index 000000000..b048feffc --- /dev/null +++ b/code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd new file mode 100644 index 000000000..c7d6975ab --- /dev/null +++ b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) + + + + + + + + + + + + From 791b08daea62c3ade7acb8875f2c948b455a8886 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 12 Mar 2024 20:25:14 +0100 Subject: [PATCH 04/11] MPS.ThirdParty: updated module properties and build aligned with other solution like JAXB --- .../models/de.itemis.mps.extensions.build.mps | 21 ++++++++++--------- .../MPS.ThirdParty/MPS.ThirdParty.msd | 8 +++---- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 3dce7fc20..054e11a1b 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -935,11 +935,6 @@ - - - - - @@ -959,15 +954,21 @@ - - - + + + + + + + + + - + - + diff --git a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd index 3ed2010f6..4683eb527 100644 --- a/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd +++ b/code/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd @@ -1,13 +1,13 @@ - + - - + + @@ -16,7 +16,7 @@ - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) From 9bef3b401b930b721c63ef2ef2a9b775567e496b Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Wed, 13 Mar 2024 10:17:09 +0100 Subject: [PATCH 05/11] build:MPS.ThirdParty: updated plugin packaging instead of packing the default modules content we create a custom jar of the module --- .../models/de.itemis.mps.extensions.build.mps | 44 +++++++++++++------ 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 054e11a1b..97d611972 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -167,7 +167,6 @@ - @@ -193,10 +192,6 @@ - - - - @@ -14872,16 +14867,39 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 000768993c42d8246e1adb7577849d06bdcc0c42 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Wed, 13 Mar 2024 11:21:46 +0100 Subject: [PATCH 06/11] third.party: we now use content from the third.party stub solution --- .../models/third.party.usage.test.mdl.mps | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps b/code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps index b048feffc..ff5b152e4 100644 --- a/code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps +++ b/code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps @@ -9,7 +9,6 @@ - @@ -18,6 +17,9 @@ + + + @@ -34,7 +36,9 @@ - + + + From 53ba9f94a00a773ad2fb57e947e6fcfa5bc04d09 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Wed, 13 Mar 2024 15:07:45 +0100 Subject: [PATCH 07/11] build:Third.Party: added module to default layout should fix problems in mbeddr.platform --- build.gradle | 2 ++ .../models/de.itemis.mps.extensions.build.mps | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/build.gradle b/build.gradle index 6fa774658..517024575 100644 --- a/build.gradle +++ b/build.gradle @@ -327,6 +327,8 @@ task packageExtensions(type: Zip, dependsOn: run_tests) { archiveBaseName = 'de.itemis.mps.extensions' from artifactsDir include 'de.itemis.mps.extensions/**' + //remove workaround which is required for mbeddr.platform build + exclude 'de.itemis.mps.extensions/MPS.ThirdParty.jar' } task cleanMps(type: Delete) { diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index 97d611972..e27c7155f 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -6,6 +6,7 @@ + @@ -42,6 +43,9 @@ + + + @@ -167,6 +171,7 @@ + @@ -192,6 +197,10 @@ + + + + @@ -14864,6 +14873,21 @@ + + + + + + + + + + + + + + + From c8ba8f69d6d747374ee14f427cc6c90dfbe7cd2a Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 13 Mar 2024 18:41:55 +0100 Subject: [PATCH 08/11] blutil: fix wrong condition in typeof_IfInstanceOfVariableElseIfBlock --- .../languageModels/typesystem.mps | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps index 98e133adc..e5e8d5f92 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps @@ -77,9 +77,6 @@ - - - @@ -3265,9 +3262,19 @@ - - - + + + + + + + + + + + + + From ee27fb5cb92a0dce8a9c9e4310245ed2abdb9c36 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 14 Mar 2024 17:38:06 +0100 Subject: [PATCH 09/11] editor.diagram: Make ShapeParameterReference assignable --- .../languageModels/behavior.mps | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps index 164d63370..9437c1639 100755 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/behavior.mps @@ -3934,5 +3934,26 @@ + + + + + + + + + + + + + + + + + + + + + From 17577dca20719285e41f0923d0d4bed41e958934 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 14 Mar 2024 22:37:15 +0100 Subject: [PATCH 10/11] Fix the build script --- .../models/de.itemis.mps.extensions.build.mps | 22 +++++++++++++++++++ .../third.party.usage.test.msd | 3 +-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index f4767c807..6d1e2ff32 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -981,6 +981,19 @@ + + + + + + + + + + + + + @@ -15519,6 +15532,15 @@ + + + + + + + + + diff --git a/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd index c7d6975ab..ba53b4e73 100644 --- a/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd +++ b/code/third-party/solutions/third.party.usage.test/third.party.usage.test.msd @@ -1,5 +1,5 @@ - + @@ -10,7 +10,6 @@ - 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) From 362d9740175542f58e6c0e05a1a50dbf2199ffb9 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 14 Mar 2024 23:10:37 +0100 Subject: [PATCH 11/11] Fix the broken references --- .../generator/template/main@generator.mps | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps index db70a2a8d..a4fa8b6e3 100644 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps @@ -64,6 +64,7 @@ + @@ -91,7 +92,7 @@ - + @@ -132,7 +133,7 @@ - + @@ -146,7 +147,7 @@ - + @@ -171,11 +172,11 @@ - + - + @@ -221,7 +222,7 @@ - + @@ -344,7 +345,7 @@ - + @@ -374,7 +375,7 @@ - + @@ -454,7 +455,7 @@ - + @@ -472,7 +473,7 @@ - + @@ -504,7 +505,7 @@ - + @@ -591,7 +592,7 @@ - + @@ -803,7 +804,7 @@ - + @@ -19930,8 +19931,8 @@ - - + + @@ -22100,8 +22101,8 @@ - - + + @@ -22187,8 +22188,8 @@ - - + + @@ -30237,3 +30238,4 @@ +