From 267b3e6ad0bb58be24bcdf14b08c42504d8153cb Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 20 Feb 2024 19:05:21 +0100 Subject: [PATCH 1/8] Rename de.slisson.mps.structurecheck to de.itemis.mps.structurecheck --- CHANGELOG.md | 1 + code/.mps/modules.xml | 6 +-- .../models/de.itemis.mps.extensions.build.mps | 37 +++++++++---------- .../mps/editor/diagram/solution@tests.mps | 17 ++++----- ....de.itemis.mps.editor.diagram.solution.msd | 3 +- .../de.itemis.mps.structurecheck.mpl} | 17 ++++----- .../generator/template/main@generator.mps | 9 ++--- .../languageModels/behavior.mps | 5 +-- .../languageModels/constraints.mps | 5 +-- ...de.itemis.mps.structurecheck.dataFlow.mps} | 5 +-- .../languageModels/editor.mps | 5 +-- .../languageModels/structure.mps | 3 +- .../languageModels/typesystem.mps | 5 +-- .../de.itemis.mps.structurecheck.runtime.msd} | 5 +-- .../de/itemis}/mps/structurecheck/runtime.mps | 3 +- .../de.itemis.mps.structurecheck.sandbox.msd} | 7 ++-- .../de/itemis}/mps/structurecheck/sandbox.mps | 21 +++++------ .../bl-extensions/structure-check.md | 2 +- docs/extensions/full_extensions_list.md | 2 +- 19 files changed, 72 insertions(+), 86 deletions(-) rename code/structurecheck/languages/{de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl => de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl} (94%) rename code/structurecheck/languages/{de.slisson.mps.structurecheck => de.itemis.mps.structurecheck}/generator/template/main@generator.mps (99%) rename code/structurecheck/languages/{de.slisson.mps.structurecheck => de.itemis.mps.structurecheck}/languageModels/behavior.mps (97%) rename code/structurecheck/languages/{de.slisson.mps.structurecheck => de.itemis.mps.structurecheck}/languageModels/constraints.mps (96%) rename code/structurecheck/languages/{de.slisson.mps.structurecheck/languageModels/de.slisson.mps.structurecheck.dataFlow.mps => de.itemis.mps.structurecheck/languageModels/de.itemis.mps.structurecheck.dataFlow.mps} (98%) rename code/structurecheck/languages/{de.slisson.mps.structurecheck => de.itemis.mps.structurecheck}/languageModels/editor.mps (99%) rename code/structurecheck/languages/{de.slisson.mps.structurecheck => de.itemis.mps.structurecheck}/languageModels/structure.mps (99%) rename code/structurecheck/languages/{de.slisson.mps.structurecheck => de.itemis.mps.structurecheck}/languageModels/typesystem.mps (98%) rename code/structurecheck/solutions/{de.slisson.mps.structurecheck.runtime/de.slisson.mps.structurecheck.runtime.msd => de.itemis.mps.structurecheck.runtime/de.itemis.mps.structurecheck.runtime.msd} (87%) rename code/structurecheck/solutions/{de.slisson.mps.structurecheck.runtime/models/de/slisson => de.itemis.mps.structurecheck.runtime/models/de/itemis}/mps/structurecheck/runtime.mps (99%) rename code/structurecheck/solutions/{de.slisson.mps.structurecheck.sandbox/de.slisson.mps.structurecheck.sandbox.msd => de.itemis.mps.structurecheck.sandbox/de.itemis.mps.structurecheck.sandbox.msd} (84%) rename code/structurecheck/solutions/{de.slisson.mps.structurecheck.sandbox/models/de/slisson => de.itemis.mps.structurecheck.sandbox/models/de/itemis}/mps/structurecheck/sandbox.mps (93%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7da4045df..668b7cb9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented ### Changed - com.mbeddr.mpsutil.editor.querylist: Dynamic generated nodes (without a model) can now be used in query lists if `read-only` is set to true. +- The language `de.slisson.mps.structurecheck` was renamed to `de.itemis.mps.structurecheck`. ### Fixed diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml index e4505ba5b..145ddbe8a 100644 --- a/code/.mps/modules.xml +++ b/code/.mps/modules.xml @@ -178,9 +178,9 @@ - - - + + + 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 c3a5b52e3..41082ebbc 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 @@ -15110,7 +15110,7 @@ - + @@ -15120,9 +15120,9 @@ - + - + @@ -15145,7 +15145,7 @@ - + @@ -15164,7 +15164,7 @@ - + @@ -15180,7 +15180,7 @@ - + @@ -15189,16 +15189,16 @@ - + - + - + @@ -15206,11 +15206,11 @@ - + - + @@ -15230,7 +15230,7 @@ - + @@ -15259,7 +15259,7 @@ - + @@ -15278,7 +15278,7 @@ - + @@ -15395,7 +15395,7 @@ - + @@ -18957,7 +18957,7 @@ - + @@ -19983,10 +19983,10 @@ - + - + @@ -20174,4 +20174,3 @@ - diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps index ab035d6d1..d937726ac 100644 --- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps +++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps @@ -10,7 +10,7 @@ - + @@ -290,25 +290,25 @@ - - + + - + - + - - + + - + @@ -9002,4 +9002,3 @@ - diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd index fcba36725..9b3bc4b5d 100644 --- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd +++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd @@ -23,7 +23,7 @@ - + @@ -66,4 +66,3 @@ - diff --git a/code/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl b/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl similarity index 94% rename from code/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl rename to code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl index e428f3bc3..7a6b9bdc2 100644 --- a/code/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ - + @@ -25,7 +25,7 @@ - 6f14e29b-9796-426f-ae46-86ea46d4d320(de.slisson.mps.structurecheck.runtime) + 6f14e29b-9796-426f-ae46-86ea46d4d320(de.itemis.mps.structurecheck.runtime) fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures) @@ -52,9 +52,9 @@ - - - + + + @@ -113,7 +113,7 @@ - + @@ -129,10 +129,9 @@ - 6f14e29b-9796-426f-ae46-86ea46d4d320(de.slisson.mps.structurecheck.runtime) + 6f14e29b-9796-426f-ae46-86ea46d4d320(de.itemis.mps.structurecheck.runtime) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - diff --git a/code/structurecheck/languages/de.slisson.mps.structurecheck/generator/template/main@generator.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/generator/template/main@generator.mps similarity index 99% rename from code/structurecheck/languages/de.slisson.mps.structurecheck/generator/template/main@generator.mps rename to code/structurecheck/languages/de.itemis.mps.structurecheck/generator/template/main@generator.mps index c5c9ff52b..a5a6ea5ba 100644 --- a/code/structurecheck/languages/de.slisson.mps.structurecheck/generator/template/main@generator.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/generator/template/main@generator.mps @@ -1,5 +1,5 @@ - + @@ -7,12 +7,12 @@ - + - + - + @@ -1371,4 +1371,3 @@ - diff --git a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/behavior.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/behavior.mps similarity index 97% rename from code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/behavior.mps rename to code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/behavior.mps index 499f52c91..533a5e220 100644 --- a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/behavior.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/behavior.mps @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -112,4 +112,3 @@ - diff --git a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/constraints.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/constraints.mps similarity index 96% rename from code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/constraints.mps rename to code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/constraints.mps index 8e1fe9a9f..bf09c60ab 100644 --- a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/constraints.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/constraints.mps @@ -1,12 +1,12 @@ - + - + @@ -84,4 +84,3 @@ - diff --git a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/de.slisson.mps.structurecheck.dataFlow.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/de.itemis.mps.structurecheck.dataFlow.mps similarity index 98% rename from code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/de.slisson.mps.structurecheck.dataFlow.mps rename to code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/de.itemis.mps.structurecheck.dataFlow.mps index 17ea40436..7289117d1 100644 --- a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/de.slisson.mps.structurecheck.dataFlow.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/de.itemis.mps.structurecheck.dataFlow.mps @@ -1,12 +1,12 @@ - + - + @@ -236,4 +236,3 @@ - diff --git a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/editor.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/editor.mps similarity index 99% rename from code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/editor.mps rename to code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/editor.mps index 0b83a1976..22011e6e1 100644 --- a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/editor.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/editor.mps @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -409,4 +409,3 @@ - diff --git a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/structure.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/structure.mps similarity index 99% rename from code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/structure.mps rename to code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/structure.mps index bd2b25937..0b4bce13b 100644 --- a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/structure.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/structure.mps @@ -1,5 +1,5 @@ - + @@ -317,4 +317,3 @@ - diff --git a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/typesystem.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/typesystem.mps similarity index 98% rename from code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/typesystem.mps rename to code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/typesystem.mps index 5b9611539..adffcad80 100644 --- a/code/structurecheck/languages/de.slisson.mps.structurecheck/languageModels/typesystem.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/typesystem.mps @@ -1,11 +1,11 @@ - + - + @@ -266,4 +266,3 @@ - diff --git a/code/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/de.slisson.mps.structurecheck.runtime.msd b/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/de.itemis.mps.structurecheck.runtime.msd similarity index 87% rename from code/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/de.slisson.mps.structurecheck.runtime.msd rename to code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/de.itemis.mps.structurecheck.runtime.msd index 111c00f16..93ae4c226 100644 --- a/code/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/de.slisson.mps.structurecheck.runtime.msd +++ b/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/de.itemis.mps.structurecheck.runtime.msd @@ -1,5 +1,5 @@ - + @@ -31,7 +31,6 @@ - + - diff --git a/code/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/models/de/slisson/mps/structurecheck/runtime.mps b/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/models/de/itemis/mps/structurecheck/runtime.mps similarity index 99% rename from code/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/models/de/slisson/mps/structurecheck/runtime.mps rename to code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/models/de/itemis/mps/structurecheck/runtime.mps index 10bf3a915..2101d48b2 100644 --- a/code/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/models/de/slisson/mps/structurecheck/runtime.mps +++ b/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/models/de/itemis/mps/structurecheck/runtime.mps @@ -1,5 +1,5 @@ - + @@ -2988,4 +2988,3 @@ - diff --git a/code/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/de.slisson.mps.structurecheck.sandbox.msd b/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/de.itemis.mps.structurecheck.sandbox.msd similarity index 84% rename from code/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/de.slisson.mps.structurecheck.sandbox.msd rename to code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/de.itemis.mps.structurecheck.sandbox.msd index d5f988bb7..bcc91c8c2 100644 --- a/code/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/de.slisson.mps.structurecheck.sandbox.msd +++ b/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/de.itemis.mps.structurecheck.sandbox.msd @@ -1,5 +1,5 @@ - + @@ -15,7 +15,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + @@ -31,7 +31,6 @@ - + - diff --git a/code/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/models/de/slisson/mps/structurecheck/sandbox.mps b/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/models/de/itemis/mps/structurecheck/sandbox.mps similarity index 93% rename from code/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/models/de/slisson/mps/structurecheck/sandbox.mps rename to code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/models/de/itemis/mps/structurecheck/sandbox.mps index df43adb7d..668a0e1a1 100644 --- a/code/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/models/de/slisson/mps/structurecheck/sandbox.mps +++ b/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/models/de/itemis/mps/structurecheck/sandbox.mps @@ -1,9 +1,9 @@ - + - + @@ -85,30 +85,30 @@ - - + + - + - + - + - - + + - + @@ -289,4 +289,3 @@ - diff --git a/docs/extensions/bl-extensions/structure-check.md b/docs/extensions/bl-extensions/structure-check.md index fb8aba2f5..c0c3fe09c 100644 --- a/docs/extensions/bl-extensions/structure-check.md +++ b/docs/extensions/bl-extensions/structure-check.md @@ -1,6 +1,6 @@ # Structure Check -**Language Namespace:** `de.slisson.mps.structurecheck` +**Language Namespace:** `de.itemis.mps.structurecheck` The statement `check structure of` can check the structure of a node. The statement throws a runtime exception when the check fails. It supports a few different checkers. The expression `thisElement` always refers to the current element: diff --git a/docs/extensions/full_extensions_list.md b/docs/extensions/full_extensions_list.md index e76cff164..208b8749b 100644 --- a/docs/extensions/full_extensions_list.md +++ b/docs/extensions/full_extensions_list.md @@ -11,7 +11,7 @@ This is a full list of all the extensions that are contained in MPS-extensions. | Name | Description | |-------------------------------------|-------------------------------------------------------------------------------| -| *de.slisson.mps.structurecheck* | adds a statement to baselanguage that allows to check the structure of a node | +| *de.itemis.mps.structurecheck* | adds a statement to baselanguage that allows to check the structure of a node | | *com.mbeddr.mpsutil.blutil* | utilities for baselanguage | | *com.mbeddr.mpsutil.blutil.genutil* | baselanguage generator utilities | From 32cc061df78794e27ef872e8351ebd115c4ceaa4 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 20 Feb 2024 19:09:58 +0100 Subject: [PATCH 2/8] Rename com.mbeddr.mpsutil.serializer.xml to de.itemis.mps.utils.serializer.xml --- CHANGELOG.md | 1 + code/.mps/modules.xml | 2 +- .../models/de.itemis.mps.extensions.build.mps | 18 +++++++++--------- .../de.itemis.mps.nodeversioning.runtime.msd | 5 ++--- code/nodeversioning/solutions/models/rt.mps | 3 +-- .../de.itemis.mps.utils.serializer.xml.msd} | 5 ++--- .../lib/LICENSE.txt | 0 .../lib/README.txt | 0 .../lib/jdom2-2.0.6.jar | Bin .../lib/lib/jaxen-1.1.6.LICENSE.txt | 0 .../lib/lib/jaxen-1.1.6.jar | Bin .../mps/utils}/serializer/xml/serializer.mps | 9 ++++----- docs/extensions/utils/serializer.md | 4 ++-- 13 files changed, 22 insertions(+), 25 deletions(-) rename code/utils/solutions/{com.mbeddr.mpsutil.serializer.xml/com.mbeddr.mpsutil.serializer.xml.msd => de.itemis.mps.utils.serializer.xml/de.itemis.mps.utils.serializer.xml.msd} (95%) rename code/utils/solutions/{com.mbeddr.mpsutil.serializer.xml => de.itemis.mps.utils.serializer.xml}/lib/LICENSE.txt (100%) rename code/utils/solutions/{com.mbeddr.mpsutil.serializer.xml => de.itemis.mps.utils.serializer.xml}/lib/README.txt (100%) rename code/utils/solutions/{com.mbeddr.mpsutil.serializer.xml => de.itemis.mps.utils.serializer.xml}/lib/jdom2-2.0.6.jar (100%) rename code/utils/solutions/{com.mbeddr.mpsutil.serializer.xml => de.itemis.mps.utils.serializer.xml}/lib/lib/jaxen-1.1.6.LICENSE.txt (100%) rename code/utils/solutions/{com.mbeddr.mpsutil.serializer.xml => de.itemis.mps.utils.serializer.xml}/lib/lib/jaxen-1.1.6.jar (100%) rename code/utils/solutions/{com.mbeddr.mpsutil.serializer.xml/models/com/mbeddr/mpsutil => de.itemis.mps.utils.serializer.xml/models/de/itemis/mps/utils}/serializer/xml/serializer.mps (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 668b7cb9f..d38a237ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented - com.mbeddr.mpsutil.editor.querylist: Dynamic generated nodes (without a model) can now be used in query lists if `read-only` is set to true. - The language `de.slisson.mps.structurecheck` was renamed to `de.itemis.mps.structurecheck`. +- The stubs `com.mbeddr.mpsutil.serializer.xml` were renamed to `de.itemis.mps.utils.serializer.xml`. ### Fixed diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml index 145ddbe8a..b94fb5836 100644 --- a/code/.mps/modules.xml +++ b/code/.mps/modules.xml @@ -194,7 +194,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 41082ebbc..e635fb1e1 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 @@ -6771,7 +6771,7 @@ - + @@ -6869,7 +6869,7 @@ - + @@ -6883,7 +6883,7 @@ - + @@ -6897,9 +6897,9 @@ - + - + @@ -6934,7 +6934,7 @@ - + @@ -6959,7 +6959,7 @@ - + @@ -6984,7 +6984,7 @@ - + @@ -14579,7 +14579,7 @@ - + diff --git a/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd b/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd index e4c8773cf..a3a3596f3 100644 --- a/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd +++ b/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd @@ -12,7 +12,7 @@ - 5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml) + 5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations) 93b43956-3552-4a1d-bf2a-f4d377edbed6(de.itemis.mps.nodeversioning) @@ -37,10 +37,9 @@ - + - diff --git a/code/nodeversioning/solutions/models/rt.mps b/code/nodeversioning/solutions/models/rt.mps index 166c013a6..77d6d8810 100644 --- a/code/nodeversioning/solutions/models/rt.mps +++ b/code/nodeversioning/solutions/models/rt.mps @@ -7,7 +7,7 @@ - + @@ -4758,4 +4758,3 @@ - diff --git a/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/com.mbeddr.mpsutil.serializer.xml.msd b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/de.itemis.mps.utils.serializer.xml.msd similarity index 95% rename from code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/com.mbeddr.mpsutil.serializer.xml.msd rename to code/utils/solutions/de.itemis.mps.utils.serializer.xml/de.itemis.mps.utils.serializer.xml.msd index ec6f15c1a..c4500413d 100755 --- a/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/com.mbeddr.mpsutil.serializer.xml.msd +++ b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/de.itemis.mps.utils.serializer.xml.msd @@ -1,5 +1,5 @@ - + @@ -66,11 +66,10 @@ - + - diff --git a/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/lib/LICENSE.txt b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/lib/LICENSE.txt similarity index 100% rename from code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/lib/LICENSE.txt rename to code/utils/solutions/de.itemis.mps.utils.serializer.xml/lib/LICENSE.txt diff --git a/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/lib/README.txt b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/lib/README.txt similarity index 100% rename from code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/lib/README.txt rename to code/utils/solutions/de.itemis.mps.utils.serializer.xml/lib/README.txt diff --git a/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/lib/jdom2-2.0.6.jar b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/lib/jdom2-2.0.6.jar similarity index 100% rename from code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/lib/jdom2-2.0.6.jar rename to code/utils/solutions/de.itemis.mps.utils.serializer.xml/lib/jdom2-2.0.6.jar diff --git a/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/lib/lib/jaxen-1.1.6.LICENSE.txt b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/lib/lib/jaxen-1.1.6.LICENSE.txt similarity index 100% rename from code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/lib/lib/jaxen-1.1.6.LICENSE.txt rename to code/utils/solutions/de.itemis.mps.utils.serializer.xml/lib/lib/jaxen-1.1.6.LICENSE.txt diff --git a/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/lib/lib/jaxen-1.1.6.jar b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/lib/lib/jaxen-1.1.6.jar similarity index 100% rename from code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/lib/lib/jaxen-1.1.6.jar rename to code/utils/solutions/de.itemis.mps.utils.serializer.xml/lib/lib/jaxen-1.1.6.jar diff --git a/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/models/com/mbeddr/mpsutil/serializer/xml/serializer.mps b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/models/de/itemis/mps/utils/serializer/xml/serializer.mps similarity index 99% rename from code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/models/com/mbeddr/mpsutil/serializer/xml/serializer.mps rename to code/utils/solutions/de.itemis.mps.utils.serializer.xml/models/de/itemis/mps/utils/serializer/xml/serializer.mps index a7c90c387..67f7f76b4 100755 --- a/code/utils/solutions/com.mbeddr.mpsutil.serializer.xml/models/com/mbeddr/mpsutil/serializer/xml/serializer.mps +++ b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/models/de/itemis/mps/utils/serializer/xml/serializer.mps @@ -1,5 +1,5 @@ - + @@ -17,9 +17,9 @@ - - - + + + @@ -5191,4 +5191,3 @@ - diff --git a/docs/extensions/utils/serializer.md b/docs/extensions/utils/serializer.md index 3ef0e6387..a05d3127f 100644 --- a/docs/extensions/utils/serializer.md +++ b/docs/extensions/utils/serializer.md @@ -2,6 +2,6 @@ ## Serializer -**Language Namespace :** `com.mbeddr.mpsutil.serializer.xml` +**Language Namespace :** `de.itemis.mps.utils.serializer.xml` -This solutions contains two classes: [NodeSerializer](http://127.0.0.1:63320/node?ref=5454dbfd-2075-4de0-b85e-fa645eb6957e%2Fr%3A5bc020f2-590a-4818-ae68-fa483b92486f%28com.mbeddr.mpsutil.serializer.xml%2Fcom.mbeddr.mpsutil.serializer.xml.serializer%29%2F98682967484619562) for serializing nodes to XML and [NodeDeserializer](http://127.0.0.1:63320/node?ref=5454dbfd-2075-4de0-b85e-fa645eb6957e%2Fr%3A5bc020f2-590a-4818-ae68-fa483b92486f%28com.mbeddr.mpsutil.serializer.xml%2Fcom.mbeddr.mpsutil.serializer.xml.serializer%29%2F98682967488267255) for deserializing nodes from XML. It uses the [JDOM Java library](http://www.jdom.org/). \ No newline at end of file +This solutions contains two classes: [NodeSerializer](http://127.0.0.1:63320/node?ref=5454dbfd-2075-4de0-b85e-fa645eb6957e%2Fr%3A5bc020f2-590a-4818-ae68-fa483b92486f%28de.itemis.mps.utils.serializer.xml%2Fde.itemis.mps.utils.serializer.xml.serializer%29%2F98682967484619562) for serializing nodes to XML and [NodeDeserializer](http://127.0.0.1:63320/node?ref=5454dbfd-2075-4de0-b85e-fa645eb6957e%2Fr%3A5bc020f2-590a-4818-ae68-fa483b92486f%28de.itemis.mps.utils.serializer.xml%2Fde.itemis.mps.utils.serializer.xml.serializer%29%2F98682967488267255) for deserializing nodes from XML. It uses the [JDOM Java library](http://www.jdom.org/). \ No newline at end of file From ca56e4256a85b12c08bbedf1736f11196be80d99 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 20 Feb 2024 19:16:08 +0100 Subject: [PATCH 3/8] Rename de.slisson.mps.hacks.xmodelgen to de.itemis.mps.hacks.xmodelgen --- CHANGELOG.md | 1 + code/.mps/modules.xml | 2 +- .../models/de.itemis.mps.extensions.build.mps | 10 +++++----- .../de.itemis.mps.hacks.xmodelgen.mpl} | 4 ++-- .../generator/template/main@generator.mps | 3 +-- .../models/behavior.mps | 5 ++--- .../models/constraints.mps | 5 ++--- .../models/editor.mps | 5 ++--- .../models/structure.mps | 3 +-- .../models/typesystem.mps | 3 +-- 10 files changed, 18 insertions(+), 23 deletions(-) rename code/hacks/languages/{de.slisson.mps.hacks.xmodelgen/de.slisson.mps.hacks.xmodelgen.mpl => de.itemis.mps.hacks.xmodelgen/de.itemis.mps.hacks.xmodelgen.mpl} (96%) rename code/hacks/languages/{de.slisson.mps.hacks.xmodelgen => de.itemis.mps.hacks.xmodelgen}/generator/template/main@generator.mps (87%) rename code/hacks/languages/{de.slisson.mps.hacks.xmodelgen => de.itemis.mps.hacks.xmodelgen}/models/behavior.mps (99%) rename code/hacks/languages/{de.slisson.mps.hacks.xmodelgen => de.itemis.mps.hacks.xmodelgen}/models/constraints.mps (98%) rename code/hacks/languages/{de.slisson.mps.hacks.xmodelgen => de.itemis.mps.hacks.xmodelgen}/models/editor.mps (98%) rename code/hacks/languages/{de.slisson.mps.hacks.xmodelgen => de.itemis.mps.hacks.xmodelgen}/models/structure.mps (97%) rename code/hacks/languages/{de.slisson.mps.hacks.xmodelgen => de.itemis.mps.hacks.xmodelgen}/models/typesystem.mps (70%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d38a237ac..f0ef97bb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented - com.mbeddr.mpsutil.editor.querylist: Dynamic generated nodes (without a model) can now be used in query lists if `read-only` is set to true. - The language `de.slisson.mps.structurecheck` was renamed to `de.itemis.mps.structurecheck`. - The stubs `com.mbeddr.mpsutil.serializer.xml` were renamed to `de.itemis.mps.utils.serializer.xml`. +- The language `de.slisson.mps.hacks.xmodelgen` was renamed to `de.itemis.mps.hacks.xmodelgen`. ### Fixed diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml index b94fb5836..abf1ea294 100644 --- a/code/.mps/modules.xml +++ b/code/.mps/modules.xml @@ -50,7 +50,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 e635fb1e1..ce09d1b97 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 @@ -4225,7 +4225,7 @@ - + @@ -4234,9 +4234,9 @@ - + - + @@ -4274,7 +4274,7 @@ - + @@ -4298,7 +4298,7 @@ - + diff --git a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/de.slisson.mps.hacks.xmodelgen.mpl b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/de.itemis.mps.hacks.xmodelgen.mpl similarity index 96% rename from code/hacks/languages/de.slisson.mps.hacks.xmodelgen/de.slisson.mps.hacks.xmodelgen.mpl rename to code/hacks/languages/de.itemis.mps.hacks.xmodelgen/de.itemis.mps.hacks.xmodelgen.mpl index 7aaeddcc8..49a8ecacd 100644 --- a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/de.slisson.mps.hacks.xmodelgen.mpl +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/de.itemis.mps.hacks.xmodelgen.mpl @@ -1,5 +1,5 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/generator/template/main@generator.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/generator/template/main@generator.mps similarity index 87% rename from code/hacks/languages/de.slisson.mps.hacks.xmodelgen/generator/template/main@generator.mps rename to code/hacks/languages/de.itemis.mps.hacks.xmodelgen/generator/template/main@generator.mps index a5d14c41e..f4b25241a 100644 --- a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/generator/template/main@generator.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/generator/template/main@generator.mps @@ -1,5 +1,5 @@ - + @@ -19,4 +19,3 @@ - diff --git a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/behavior.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/behavior.mps similarity index 99% rename from code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/behavior.mps rename to code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/behavior.mps index 548a7716b..d58bd15ed 100644 --- a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/behavior.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/behavior.mps @@ -1,5 +1,5 @@ - + @@ -27,7 +27,7 @@ - + @@ -1875,4 +1875,3 @@ - diff --git a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/constraints.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/constraints.mps similarity index 98% rename from code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/constraints.mps rename to code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/constraints.mps index ef0042cba..11d4b3b1c 100644 --- a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/constraints.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/constraints.mps @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -164,4 +164,3 @@ - diff --git a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/editor.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/editor.mps similarity index 98% rename from code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/editor.mps rename to code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/editor.mps index 545d88366..9e3c54a94 100644 --- a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/editor.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/editor.mps @@ -1,12 +1,12 @@ - + - + @@ -205,4 +205,3 @@ - diff --git a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/structure.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/structure.mps similarity index 97% rename from code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/structure.mps rename to code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/structure.mps index 8728bf78f..dccacba5b 100644 --- a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/structure.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/structure.mps @@ -1,5 +1,5 @@ - + @@ -71,4 +71,3 @@ - diff --git a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/typesystem.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/typesystem.mps similarity index 70% rename from code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/typesystem.mps rename to code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/typesystem.mps index 777db5a2b..3b7de5c74 100644 --- a/code/hacks/languages/de.slisson.mps.hacks.xmodelgen/models/typesystem.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/typesystem.mps @@ -1,5 +1,5 @@ - + @@ -7,4 +7,3 @@ - From ef56b1359e639c04f1c748ba83a14b3676e6f04d Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 20 Feb 2024 19:17:30 +0100 Subject: [PATCH 4/8] Force save all --- .../models/de.itemis.mps.extensions.build.mps | 1 + .../test/de/itemis/mps/editor/diagram/solution@tests.mps | 1 + .../test.de.itemis.mps.editor.diagram.solution.msd | 1 + .../de.itemis.mps.hacks.xmodelgen/models/behavior.mps | 1 + .../de.itemis.mps.hacks.xmodelgen/models/constraints.mps | 1 + .../languages/de.itemis.mps.hacks.xmodelgen/models/editor.mps | 1 + .../de.itemis.mps.hacks.xmodelgen/models/structure.mps | 1 + .../de.itemis.mps.hacks.xmodelgen/models/typesystem.mps | 1 + code/multiline/languages/demolang/languageModels/structure.mps | 2 +- .../solutions/de.itemis.mps.nodeversioning.runtime.msd | 3 ++- code/nodeversioning/solutions/models/rt.mps | 1 + .../de.itemis.mps.structurecheck.mpl | 1 + .../generator/template/main@generator.mps | 1 + .../de.itemis.mps.structurecheck/languageModels/behavior.mps | 1 + .../languageModels/constraints.mps | 1 + .../languageModels/de.itemis.mps.structurecheck.dataFlow.mps | 1 + .../de.itemis.mps.structurecheck/languageModels/editor.mps | 1 + .../de.itemis.mps.structurecheck/languageModels/structure.mps | 1 + .../de.itemis.mps.structurecheck/languageModels/typesystem.mps | 1 + .../de.itemis.mps.structurecheck.runtime.msd | 1 + .../models/de/itemis/mps/structurecheck/runtime.mps | 1 + .../de.itemis.mps.structurecheck.sandbox.msd | 1 + .../models/de/itemis/mps/structurecheck/sandbox.mps | 1 + .../de.itemis.mps.utils.serializer.xml.msd | 1 + .../models/de/itemis/mps/utils/serializer/xml/serializer.mps | 1 + 25 files changed, 26 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 ce09d1b97..d7e495c6e 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 @@ -20174,3 +20174,4 @@ + diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps index d937726ac..beaf84212 100644 --- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps +++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps @@ -9002,3 +9002,4 @@ + diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd index 9b3bc4b5d..a6ca751bd 100644 --- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd +++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd @@ -66,3 +66,4 @@ + diff --git a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/behavior.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/behavior.mps index d58bd15ed..eb71e8948 100644 --- a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/behavior.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/behavior.mps @@ -1875,3 +1875,4 @@ + diff --git a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/constraints.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/constraints.mps index 11d4b3b1c..bbc086e43 100644 --- a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/constraints.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/constraints.mps @@ -164,3 +164,4 @@ + diff --git a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/editor.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/editor.mps index 9e3c54a94..0668a0fa3 100644 --- a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/editor.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/editor.mps @@ -205,3 +205,4 @@ + diff --git a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/structure.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/structure.mps index dccacba5b..7d184936f 100644 --- a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/structure.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/structure.mps @@ -71,3 +71,4 @@ + diff --git a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/typesystem.mps b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/typesystem.mps index 3b7de5c74..a73cfd75a 100644 --- a/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/typesystem.mps +++ b/code/hacks/languages/de.itemis.mps.hacks.xmodelgen/models/typesystem.mps @@ -7,3 +7,4 @@ + diff --git a/code/multiline/languages/demolang/languageModels/structure.mps b/code/multiline/languages/demolang/languageModels/structure.mps index 6b4447a63..475ff7350 100644 --- a/code/multiline/languages/demolang/languageModels/structure.mps +++ b/code/multiline/languages/demolang/languageModels/structure.mps @@ -88,7 +88,7 @@ - + diff --git a/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd b/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd index a3a3596f3..0346cf3fc 100644 --- a/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd +++ b/code/nodeversioning/solutions/de.itemis.mps.nodeversioning.runtime.msd @@ -37,9 +37,10 @@ - + + diff --git a/code/nodeversioning/solutions/models/rt.mps b/code/nodeversioning/solutions/models/rt.mps index 77d6d8810..d6fe526d0 100644 --- a/code/nodeversioning/solutions/models/rt.mps +++ b/code/nodeversioning/solutions/models/rt.mps @@ -4758,3 +4758,4 @@ + diff --git a/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl b/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl index 7a6b9bdc2..c9188a5d1 100644 --- a/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl @@ -135,3 +135,4 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + diff --git a/code/structurecheck/languages/de.itemis.mps.structurecheck/generator/template/main@generator.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/generator/template/main@generator.mps index a5a6ea5ba..3f7a88ffa 100644 --- a/code/structurecheck/languages/de.itemis.mps.structurecheck/generator/template/main@generator.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/generator/template/main@generator.mps @@ -1371,3 +1371,4 @@ + diff --git a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/behavior.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/behavior.mps index 533a5e220..d81ddfb05 100644 --- a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/behavior.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/behavior.mps @@ -112,3 +112,4 @@ + diff --git a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/constraints.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/constraints.mps index bf09c60ab..9e05b8f08 100644 --- a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/constraints.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/constraints.mps @@ -84,3 +84,4 @@ + diff --git a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/de.itemis.mps.structurecheck.dataFlow.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/de.itemis.mps.structurecheck.dataFlow.mps index 7289117d1..ed62a2801 100644 --- a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/de.itemis.mps.structurecheck.dataFlow.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/de.itemis.mps.structurecheck.dataFlow.mps @@ -236,3 +236,4 @@ + diff --git a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/editor.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/editor.mps index 22011e6e1..4e90760b4 100644 --- a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/editor.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/editor.mps @@ -409,3 +409,4 @@ + diff --git a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/structure.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/structure.mps index 0b4bce13b..68586d987 100644 --- a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/structure.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/structure.mps @@ -317,3 +317,4 @@ + diff --git a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/typesystem.mps b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/typesystem.mps index adffcad80..dfb9eae01 100644 --- a/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/typesystem.mps +++ b/code/structurecheck/languages/de.itemis.mps.structurecheck/languageModels/typesystem.mps @@ -266,3 +266,4 @@ + diff --git a/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/de.itemis.mps.structurecheck.runtime.msd b/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/de.itemis.mps.structurecheck.runtime.msd index 93ae4c226..04ef9fa43 100644 --- a/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/de.itemis.mps.structurecheck.runtime.msd +++ b/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/de.itemis.mps.structurecheck.runtime.msd @@ -34,3 +34,4 @@ + diff --git a/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/models/de/itemis/mps/structurecheck/runtime.mps b/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/models/de/itemis/mps/structurecheck/runtime.mps index 2101d48b2..be1925481 100644 --- a/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/models/de/itemis/mps/structurecheck/runtime.mps +++ b/code/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/models/de/itemis/mps/structurecheck/runtime.mps @@ -2988,3 +2988,4 @@ + diff --git a/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/de.itemis.mps.structurecheck.sandbox.msd b/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/de.itemis.mps.structurecheck.sandbox.msd index bcc91c8c2..ca7a6b68d 100644 --- a/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/de.itemis.mps.structurecheck.sandbox.msd +++ b/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/de.itemis.mps.structurecheck.sandbox.msd @@ -34,3 +34,4 @@ + diff --git a/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/models/de/itemis/mps/structurecheck/sandbox.mps b/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/models/de/itemis/mps/structurecheck/sandbox.mps index 668a0e1a1..847dbed55 100644 --- a/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/models/de/itemis/mps/structurecheck/sandbox.mps +++ b/code/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/models/de/itemis/mps/structurecheck/sandbox.mps @@ -289,3 +289,4 @@ + diff --git a/code/utils/solutions/de.itemis.mps.utils.serializer.xml/de.itemis.mps.utils.serializer.xml.msd b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/de.itemis.mps.utils.serializer.xml.msd index c4500413d..17ca7ce88 100755 --- a/code/utils/solutions/de.itemis.mps.utils.serializer.xml/de.itemis.mps.utils.serializer.xml.msd +++ b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/de.itemis.mps.utils.serializer.xml.msd @@ -73,3 +73,4 @@ + diff --git a/code/utils/solutions/de.itemis.mps.utils.serializer.xml/models/de/itemis/mps/utils/serializer/xml/serializer.mps b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/models/de/itemis/mps/utils/serializer/xml/serializer.mps index 67f7f76b4..6dfb59cf8 100755 --- a/code/utils/solutions/de.itemis.mps.utils.serializer.xml/models/de/itemis/mps/utils/serializer/xml/serializer.mps +++ b/code/utils/solutions/de.itemis.mps.utils.serializer.xml/models/de/itemis/mps/utils/serializer/xml/serializer.mps @@ -5191,3 +5191,4 @@ + From 4269d3b0db167be8591fb7503400f2357a69d1e4 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 2 Mar 2023 16:49:52 +0100 Subject: [PATCH 5/8] mpsutil.blutil: deprecate MethodLineDoc + migrate BLDoc if possible --- CHANGELOG.md | 6 +- code/.mps/modules.xml | 1 + .../com.mbeddr.mpsutil.blutil/blutil.mpl | 5 +- .../languageModels/migration.mps | 1006 ++++++++++++++++- .../languageModels/structure.mps | 1 + ...st.com.mbeddr.mpsutil.blutil.doc@tests.mps | 400 +++++++ .../test.com.mbeddr.mpsutil.blutil.doc.msd | 46 + .../tests/test.ts.match/models/main@tests.mps | 1 + .../models/de.itemis.mps.extensions.build.mps | 156 ++- 9 files changed, 1581 insertions(+), 41 deletions(-) create mode 100644 code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps create mode 100644 code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd diff --git a/CHANGELOG.md b/CHANGELOG.md index 7da4045df..9a9d5b0de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,16 @@ 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. -## Feburary 2024 +## February 2024 ### Changed - com.mbeddr.mpsutil.editor.querylist: Dynamic generated nodes (without a model) can now be used in query lists if `read-only` is set to true. +### Deprecated + +- MethodLineDoc is now deprecated and an automatic migration is provided to migrate to `jetbrains.mps.baseLanguage.javadoc`. + ### Fixed - de.slisson.mps.editor.multiline.runtime: An issue was fixed where pressing shift+enter didn't enter a new line in the current text but in the next collection in the editor. diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml index e4505ba5b..e33dc9e2a 100644 --- a/code/.mps/modules.xml +++ b/code/.mps/modules.xml @@ -7,6 +7,7 @@ + diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl index ac5760a76..812d8dfda 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl @@ -1,5 +1,5 @@ - + @@ -132,6 +132,7 @@ 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) 3a13115c-633c-4c5c-bbcc-75c4219e9555(jetbrains.mps.lang.quotation) + f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc) @@ -161,6 +162,7 @@ + @@ -190,6 +192,7 @@ + diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/migration.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/migration.mps index 8d1b6474b..67de299d7 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/migration.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/migration.mps @@ -4,6 +4,10 @@ + + + + @@ -11,8 +15,13 @@ - + + + + + + @@ -26,9 +35,19 @@ + + + + + + + + + + @@ -42,22 +61,29 @@ + + + + + + + @@ -71,6 +97,9 @@ + + + @@ -81,6 +110,9 @@ + + + @@ -95,6 +127,9 @@ + + + @@ -104,6 +139,10 @@ + + + + @@ -111,6 +150,12 @@ + + + + + + @@ -119,16 +164,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -145,7 +230,13 @@ + + + + + + @@ -277,5 +368,918 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/structure.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/structure.mps index 77a873a04..43ff86e34 100755 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/structure.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/structure.mps @@ -885,6 +885,7 @@ + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps new file mode 100644 index 000000000..963ccf8b0 --- /dev/null +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd new file mode 100644 index 000000000..979edd1e3 --- /dev/null +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + 63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/blutil/tests/test.ts.match/models/main@tests.mps b/code/blutil/tests/test.ts.match/models/main@tests.mps index 435e04fc0..55a37b72e 100644 --- a/code/blutil/tests/test.ts.match/models/main@tests.mps +++ b/code/blutil/tests/test.ts.match/models/main@tests.mps @@ -5,6 +5,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 c3a5b52e3..df5e7bf44 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 @@ -930,6 +930,16 @@ + + + + + + + + + + @@ -949,16 +959,6 @@ - - - - - - - - - - @@ -6373,13 +6373,18 @@ - - + + + + + + + - - + + @@ -7284,6 +7289,22 @@ + + + + + + + + + + + + + + + + @@ -7314,22 +7335,6 @@ - - - - - - - - - - - - - - - - @@ -12132,6 +12137,9 @@ + + + @@ -12141,9 +12149,6 @@ - - - @@ -13162,6 +13167,11 @@ + + + + + @@ -13202,11 +13212,6 @@ - - - - - @@ -15699,6 +15704,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 63d082a5199e8f60cd248c5260b1defd9dc27353 Mon Sep 17 00:00:00 2001 From: KemalSoysal Date: Fri, 15 Dec 2023 22:41:21 +0100 Subject: [PATCH 6/8] #720 add a SPDX compliant license and organization into the published mps-extensions pom --- build.gradle | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 31484f9bf..6ab667f82 100644 --- a/build.gradle +++ b/build.gradle @@ -331,7 +331,22 @@ allprojects { } } } - +def additionalPomInfo = { + licenses { + // official SPDX identifier + // see https://spdx.org/licenses/ for list + license { + name = "Apache-2.0" + url = "http://www.apache.org/licenses/LICENSE-2.0.txt" + comments = "A business-friendly OSS license" + distribution = "repo" + } + } + organization { + name = "JetBrains s.r.o" + url = "https://www.jetbrains.com" + } +} publishing { publications { extensions(MavenPublication) { @@ -350,6 +365,7 @@ publishing { dependencyNode.appendNode('scope', 'provided') } } + pom additionalPomInfo } } } From 19a07fe4e5524bddc8d6469e25d7b858ad2a32c0 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 25 Feb 2024 13:03:29 +0100 Subject: [PATCH 7/8] Improve typesystem report statements --- .../languageModels/behavior.mps | 2 +- .../languageModels/typesystem.mps | 22 ++-- code/blutil/tests/test.ts.match/match.msd | 4 + .../tests/test.ts.match/models/main@tests.mps | 113 ++++++++++++++++++ .../models/de.itemis.mps.extensions.build.mps | 5 + .../languageModels/typesystem.mps | 69 +++++------ .../languageModels/structure.mps | 8 +- .../languageModels/typesystem.mps | 25 +--- .../mpsutil/grammarcells/typesystem.mps | 10 +- .../languageModels/typesystem.mps | 6 +- .../de.itemis.model.merge.typesystem.mps | 105 ++++++++-------- .../languageModels/typesystem.mps | 49 ++++---- .../languageModels/structure.mps | 2 +- .../languageModels/typesystem.mps | 4 +- .../languageModels/typesystem.mps | 2 +- .../languageModels/typesystem.mps | 2 +- .../richtext/languageModels/typesystem.mps | 2 +- .../models/typesystem.mps | 50 +++----- .../models/typesystem.mps | 4 +- .../models/typesystem.mps | 16 +-- .../models/typesystem.mps | 2 +- .../models/typesystem.mps | 2 +- .../models/typesystem.mps | 16 ++- 23 files changed, 303 insertions(+), 217 deletions(-) diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/behavior.mps b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/behavior.mps index d3a931e48..df0df641d 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/behavior.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/behavior.mps @@ -1207,7 +1207,7 @@ - + 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 2a9ada6d4..f1230faa3 100755 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps @@ -955,7 +955,7 @@ - + @@ -2010,7 +2010,7 @@ - + @@ -2091,7 +2091,7 @@ - + @@ -2135,7 +2135,7 @@ - + @@ -2179,7 +2179,7 @@ - + @@ -2628,7 +2628,7 @@ - + @@ -2706,7 +2706,7 @@ - + @@ -2740,7 +2740,7 @@ - + @@ -3026,7 +3026,7 @@ - + @@ -3084,7 +3084,7 @@ - + @@ -3118,7 +3118,7 @@ - + diff --git a/code/blutil/tests/test.ts.match/match.msd b/code/blutil/tests/test.ts.match/match.msd index c10cd6042..68a6e8f78 100644 --- a/code/blutil/tests/test.ts.match/match.msd +++ b/code/blutil/tests/test.ts.match/match.msd @@ -14,6 +14,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + 63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil) @@ -38,7 +39,10 @@ + + + diff --git a/code/blutil/tests/test.ts.match/models/main@tests.mps b/code/blutil/tests/test.ts.match/models/main@tests.mps index 55a37b72e..5650301e0 100644 --- a/code/blutil/tests/test.ts.match/models/main@tests.mps +++ b/code/blutil/tests/test.ts.match/models/main@tests.mps @@ -10,15 +10,30 @@ + + + + + + + + + + + + + + + @@ -202,6 +217,9 @@ + + + @@ -1431,6 +1449,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 4bc9f5585..58a5d5903 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 @@ -15923,6 +15923,11 @@ + + + + + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/typesystem.mps b/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/typesystem.mps index c7f66d9c5..eeec814fc 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/typesystem.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demolang/languageModels/typesystem.mps @@ -6,8 +6,9 @@ - + + @@ -76,37 +77,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -120,7 +90,7 @@ - + @@ -128,7 +98,7 @@ - + @@ -140,5 +110,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps index 47e84b74d..cd8cba573 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps @@ -29,7 +29,9 @@ - + + + @@ -711,7 +713,9 @@ - + + + diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps index e6df953d6..8bebef6ac 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps +++ b/code/diagram/languages/de.itemis.mps.editor.diagram/languageModels/typesystem.mps @@ -63,9 +63,6 @@ - - - @@ -656,24 +653,6 @@ - - - - - - - - - - - - - - - - - - @@ -1018,7 +997,7 @@ - + @@ -1046,7 +1025,7 @@ - + diff --git a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/typesystem.mps b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/typesystem.mps index 83f721947..f7965f12d 100755 --- a/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/typesystem.mps +++ b/code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells/models/com/mbeddr/mpsutil/grammarcells/typesystem.mps @@ -425,7 +425,7 @@ - + @@ -536,7 +536,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -590,7 +590,7 @@ - + @@ -684,7 +684,7 @@ - + diff --git a/code/hacks/languages/de.itemis.mps.nativelibs/languageModels/typesystem.mps b/code/hacks/languages/de.itemis.mps.nativelibs/languageModels/typesystem.mps index ded87ec09..e658880c4 100644 --- a/code/hacks/languages/de.itemis.mps.nativelibs/languageModels/typesystem.mps +++ b/code/hacks/languages/de.itemis.mps.nativelibs/languageModels/typesystem.mps @@ -179,7 +179,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -425,7 +425,7 @@ - + diff --git a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.typesystem.mps b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.typesystem.mps index 0271b86cd..dd542768f 100644 --- a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.typesystem.mps +++ b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.typesystem.mps @@ -466,7 +466,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -623,11 +623,11 @@ - + - + @@ -724,7 +724,7 @@ - + @@ -757,7 +757,7 @@ - + @@ -865,7 +865,7 @@ - + @@ -958,7 +958,7 @@ - + @@ -1359,14 +1359,14 @@ - + - + @@ -1592,14 +1592,14 @@ - + - + @@ -1824,14 +1824,14 @@ - + - + @@ -2050,14 +2050,14 @@ - + - + @@ -2169,56 +2169,51 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + - - + + - - + + - - + + - - - - - - - + + - - + + + + + + + - - - - - - - + + + + + + + + + + diff --git a/code/math/languages/de.itemis.mps.editor.math.java/languageModels/typesystem.mps b/code/math/languages/de.itemis.mps.editor.math.java/languageModels/typesystem.mps index f22f29e06..33e4ee855 100644 --- a/code/math/languages/de.itemis.mps.editor.math.java/languageModels/typesystem.mps +++ b/code/math/languages/de.itemis.mps.editor.math.java/languageModels/typesystem.mps @@ -236,44 +236,39 @@ - - - - - - - - - - - - - - - + + + + + + + + + + - - - - + - - + + - - + + - - + + - - + + + + + diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/languageModels/structure.mps b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/languageModels/structure.mps index 31585857b..c4363cffe 100644 --- a/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/languageModels/structure.mps +++ b/code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/languageModels/structure.mps @@ -43,8 +43,8 @@ - + diff --git a/code/modellisteners/com.mbeddr.mpsutil.modellisteners/languageModels/typesystem.mps b/code/modellisteners/com.mbeddr.mpsutil.modellisteners/languageModels/typesystem.mps index df61665c7..68914d81b 100644 --- a/code/modellisteners/com.mbeddr.mpsutil.modellisteners/languageModels/typesystem.mps +++ b/code/modellisteners/com.mbeddr.mpsutil.modellisteners/languageModels/typesystem.mps @@ -109,7 +109,7 @@ - + @@ -182,7 +182,7 @@ - + diff --git a/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/typesystem.mps b/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/typesystem.mps index 1a2b7f7dd..43109182b 100644 --- a/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/typesystem.mps +++ b/code/projectview/com.mbeddr.mpsutil.projectview/languageModels/typesystem.mps @@ -573,7 +573,7 @@ - + diff --git a/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/typesystem.mps b/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/typesystem.mps index 2f856cfdf..a649f4375 100644 --- a/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/typesystem.mps +++ b/code/querylist/com.mbeddr.mpsutil.editor.querylist/languageModels/typesystem.mps @@ -231,7 +231,7 @@ - + diff --git a/code/richtext/languages/richtext/languageModels/typesystem.mps b/code/richtext/languages/richtext/languageModels/typesystem.mps index a4b3e5537..c88374c3d 100644 --- a/code/richtext/languages/richtext/languageModels/typesystem.mps +++ b/code/richtext/languages/richtext/languageModels/typesystem.mps @@ -138,7 +138,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.incremental/models/typesystem.mps b/code/shadowmodels/languages/de.q60.mps.incremental/models/typesystem.mps index 9948e192a..53083452e 100644 --- a/code/shadowmodels/languages/de.q60.mps.incremental/models/typesystem.mps +++ b/code/shadowmodels/languages/de.q60.mps.incremental/models/typesystem.mps @@ -176,11 +176,15 @@ + + + + @@ -564,7 +568,7 @@ - + @@ -1124,27 +1128,15 @@ - - - - - - - - - - - - - - - - - + + + + + @@ -1218,27 +1210,15 @@ - - - - - - - - - - - - - - - - - + + + + + diff --git a/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/models/typesystem.mps b/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/models/typesystem.mps index 5a363a708..811ac6f37 100644 --- a/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/models/typesystem.mps +++ b/code/shadowmodels/languages/de.q60.mps.polymorphicfunctions/models/typesystem.mps @@ -682,7 +682,7 @@ - + @@ -812,7 +812,7 @@ - + diff --git a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/typesystem.mps b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/typesystem.mps index 3064d3b2b..4d8a919a5 100644 --- a/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/typesystem.mps +++ b/code/shadowmodels/languages/de.q60.mps.shadowmodels.transformation/models/typesystem.mps @@ -1268,7 +1268,7 @@ - + @@ -1341,7 +1341,7 @@ - + @@ -3938,7 +3938,7 @@ - + @@ -4142,7 +4142,7 @@ - + @@ -5534,11 +5534,11 @@ - + - + @@ -5716,11 +5716,11 @@ - + - + diff --git a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/typesystem.mps b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/typesystem.mps index 3239ebb4a..5816d13dc 100644 --- a/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/typesystem.mps +++ b/code/shadowmodels/languages/de.q60.mps.virtualinterfaces/models/typesystem.mps @@ -459,7 +459,7 @@ - + diff --git a/code/treenotation/com.mbeddr.mpsutil.treenotation/models/typesystem.mps b/code/treenotation/com.mbeddr.mpsutil.treenotation/models/typesystem.mps index cf2323b68..beeec0b2a 100644 --- a/code/treenotation/com.mbeddr.mpsutil.treenotation/models/typesystem.mps +++ b/code/treenotation/com.mbeddr.mpsutil.treenotation/models/typesystem.mps @@ -218,7 +218,7 @@ - + diff --git a/code/widgets/languages/de.itemis.mps.editor.enumeration/models/typesystem.mps b/code/widgets/languages/de.itemis.mps.editor.enumeration/models/typesystem.mps index 438272ec3..53777248c 100644 --- a/code/widgets/languages/de.itemis.mps.editor.enumeration/models/typesystem.mps +++ b/code/widgets/languages/de.itemis.mps.editor.enumeration/models/typesystem.mps @@ -86,6 +86,9 @@ + + + @@ -102,6 +105,7 @@ + @@ -229,7 +233,7 @@ - + @@ -433,19 +437,25 @@ - + + + + - + + + + From 05c6ca126517f67170bf2af366048062406301dd Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 5 Mar 2024 11:16:24 +0100 Subject: [PATCH 8/8] Run migrations --- code/.mps/modules.xml | 4 +- .../com.mbeddr.mpsutil.blutil/blutil.mpl | 2 +- .../com.mbeddr.mpsutil.blutil.genutil.rt.msd | 2 +- .../models/genUtil.mps | 2 +- ...st.com.mbeddr.mpsutil.blutil.doc@tests.mps | 43 +++++++++++++------ .../test.com.mbeddr.mpsutil.blutil.doc.msd | 13 ++++-- ...eddr.mpsutil.blutil.ifInstanceOf@tests.mps | 2 +- .../test.com.mbeddr.mpsutil.blutil.msd | 2 +- .../models/test.ts.conceptswitch@tests.mps | 2 +- .../test.ts.conceptswitch.msd | 2 +- code/blutil/tests/test.ts.match/match.msd | 7 ++- .../tests/test.ts.match/models/main@tests.mps | 2 +- .../models/de.itemis.mps.extensions.build.mps | 10 ----- .../de.q60.mps.shadowmodels.runtime.msd | 2 +- .../models/engine.mps | 2 +- 15 files changed, 57 insertions(+), 40 deletions(-) diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml index 8a2624768..e1e53bec5 100644 --- a/code/.mps/modules.xml +++ b/code/.mps/modules.xml @@ -53,8 +53,8 @@ - + @@ -198,8 +198,8 @@ - + diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl index a968688c9..ca15ce16f 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl @@ -203,8 +203,8 @@ - + diff --git a/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd b/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd index 44537e729..297f9c4e9 100644 --- a/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd +++ b/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd @@ -19,7 +19,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - + diff --git a/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/models/genUtil.mps b/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/models/genUtil.mps index db802bf41..3accebb40 100644 --- a/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/models/genUtil.mps +++ b/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/models/genUtil.mps @@ -5,7 +5,7 @@ - + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps index 963ccf8b0..cf5cbc402 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps @@ -2,8 +2,8 @@ - - + + @@ -199,10 +199,15 @@ - - - - + + + + + + + + + @@ -238,10 +243,15 @@ - - - - + + + + + + + + + @@ -358,10 +368,15 @@ - - - - + + + + + + + + + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd index 979edd1e3..deecac528 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd @@ -16,15 +16,17 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - - + + - + + + @@ -38,7 +40,12 @@ + + + + + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.ifInstanceOf@tests.mps b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.ifInstanceOf@tests.mps index 1642ccc3a..668b8b25a 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.ifInstanceOf@tests.mps +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/models/test.com.mbeddr.mpsutil.blutil.ifInstanceOf@tests.mps @@ -5,7 +5,7 @@ - + diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd index ef08a3ab7..7815872ae 100644 --- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd @@ -15,7 +15,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - + diff --git a/code/blutil/tests/test.ts.conceptswitch/models/test.ts.conceptswitch@tests.mps b/code/blutil/tests/test.ts.conceptswitch/models/test.ts.conceptswitch@tests.mps index 5efe0d189..e76b71b80 100644 --- a/code/blutil/tests/test.ts.conceptswitch/models/test.ts.conceptswitch@tests.mps +++ b/code/blutil/tests/test.ts.conceptswitch/models/test.ts.conceptswitch@tests.mps @@ -4,7 +4,7 @@ - + diff --git a/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd b/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd index 180ab1618..2150576c1 100644 --- a/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd +++ b/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd @@ -17,7 +17,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - + diff --git a/code/blutil/tests/test.ts.match/match.msd b/code/blutil/tests/test.ts.match/match.msd index fc58c47a7..fa336b49f 100644 --- a/code/blutil/tests/test.ts.match/match.msd +++ b/code/blutil/tests/test.ts.match/match.msd @@ -17,7 +17,7 @@ 63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil) - + @@ -45,7 +45,12 @@ + + + + + diff --git a/code/blutil/tests/test.ts.match/models/main@tests.mps b/code/blutil/tests/test.ts.match/models/main@tests.mps index dff9f5163..5d6fb1c92 100644 --- a/code/blutil/tests/test.ts.match/models/main@tests.mps +++ b/code/blutil/tests/test.ts.match/models/main@tests.mps @@ -4,7 +4,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 65d896d1a..09d5c3e53 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 @@ -936,16 +936,6 @@ - - - - - - - - - - diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd index 9e08bd930..677254272 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd @@ -32,7 +32,7 @@ ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs) - + diff --git a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps index ac3f87f4c..8fb8ee754 100644 --- a/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps +++ b/code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/models/engine.mps @@ -9,7 +9,7 @@ - +