diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d3fcf045..615711684 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ 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 ### Added @@ -19,6 +19,13 @@ 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`. +- 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`. + +### Deprecated + +- MethodLineDoc is now deprecated and an automatic migration is provided to migrate to `jetbrains.mps.baseLanguage.javadoc`. ### Fixed diff --git a/build.gradle b/build.gradle index baa0479ae..6fa774658 100644 --- a/build.gradle +++ b/build.gradle @@ -363,7 +363,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) { @@ -382,6 +397,7 @@ publishing { dependencyNode.appendNode('scope', 'provided') } } + pom additionalPomInfo } } } diff --git a/code/.mps/modules.xml b/code/.mps/modules.xml index ca041a8d3..e1e53bec5 100644 --- a/code/.mps/modules.xml +++ b/code/.mps/modules.xml @@ -7,6 +7,7 @@ + @@ -52,8 +53,8 @@ + - @@ -181,9 +182,9 @@ - - - + + + @@ -197,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 0281d6751..ca15ce16f 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 @@ - + @@ -139,6 +139,7 @@ 3a13115c-633c-4c5c-bbcc-75c4219e9555(jetbrains.mps.lang.quotation) 760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging) 13744753-c81f-424a-9c1b-cf8943bf4e86(jetbrains.mps.lang.sharedConcepts) + f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc) @@ -172,6 +173,7 @@ + @@ -201,6 +203,7 @@ + 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 8c978ad9b..c35d7e460 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/behavior.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/behavior.mps @@ -1209,7 +1209,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 24301a697..27dcd434e 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/structure.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/structure.mps @@ -886,6 +886,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 c730cd6f9..6eb05b2b7 100644 --- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps +++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/typesystem.mps @@ -961,7 +961,7 @@ - + @@ -2016,7 +2016,7 @@ - + @@ -2097,7 +2097,7 @@ - + @@ -2141,7 +2141,7 @@ - + @@ -2185,7 +2185,7 @@ - + @@ -2634,7 +2634,7 @@ - + @@ -2712,7 +2712,7 @@ - + @@ -2746,7 +2746,7 @@ - + @@ -3032,7 +3032,7 @@ - + @@ -3090,7 +3090,7 @@ - + @@ -3124,7 +3124,7 @@ - + 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 new file mode 100644 index 000000000..cf5cbc402 --- /dev/null +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/models/test.com.mbeddr.mpsutil.blutil.doc@tests.mps @@ -0,0 +1,415 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..deecac528 --- /dev/null +++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + 63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 2231c2941..fa336b49f 100644 --- a/code/blutil/tests/test.ts.match/match.msd +++ b/code/blutil/tests/test.ts.match/match.msd @@ -14,9 +14,10 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + 63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil) - + @@ -38,10 +39,18 @@ + + + + + + + + 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 eb1d73ca6..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,21 +4,37 @@ - + + + + + + + + + + + + + + + + + @@ -202,6 +218,9 @@ + + + @@ -1432,6 +1451,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 318617380..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 @@ -4221,7 +4221,7 @@ - + @@ -4230,9 +4230,9 @@ - + - + @@ -4270,7 +4270,7 @@ - + @@ -4294,7 +4294,7 @@ - + @@ -6648,13 +6648,18 @@ - - + + + + + + + - - + + @@ -7066,7 +7071,7 @@ - + @@ -7164,7 +7169,7 @@ - + @@ -7178,7 +7183,7 @@ - + @@ -7192,9 +7197,9 @@ - + - + @@ -7229,7 +7234,7 @@ - + @@ -7254,7 +7259,7 @@ - + @@ -7279,7 +7284,7 @@ - + @@ -7584,6 +7589,22 @@ + + + + + + + + + + + + + + + + @@ -7614,22 +7635,6 @@ - - - - - - - - - - - - - - - - @@ -12404,6 +12409,9 @@ + + + @@ -12413,9 +12421,6 @@ - - - @@ -13434,6 +13439,11 @@ + + + + + @@ -14884,7 +14894,7 @@ - + @@ -15400,7 +15410,7 @@ - + @@ -15410,9 +15420,9 @@ - + - + @@ -15435,7 +15445,7 @@ - + @@ -15454,7 +15464,7 @@ - + @@ -15470,7 +15480,7 @@ - + @@ -15479,16 +15489,16 @@ - + - + - + @@ -15496,11 +15506,11 @@ - + - + @@ -15520,7 +15530,7 @@ - + @@ -15549,7 +15559,7 @@ - + @@ -15568,7 +15578,7 @@ - + @@ -15685,7 +15695,7 @@ - + @@ -15989,6 +15999,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16133,6 +16218,11 @@ + + + + + @@ -19247,7 +19337,7 @@ - + @@ -20273,10 +20363,10 @@ - + - + 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/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 112040849..758a19fd7 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 @@ - - + + - + - + - - + + - + 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 1f41163fe..1d8fcd0ce 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 @@ - + 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 100644 --- 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.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..eb71e8948 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 @@ - + 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..bbc086e43 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 @@ - + 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..0668a0fa3 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 @@ - + - + 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..7d184936f 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 @@ - + 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..a73cfd75a 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 @@ - + 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/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 e4c8773cf..0346cf3fc 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,9 +37,9 @@ - + diff --git a/code/nodeversioning/solutions/models/rt.mps b/code/nodeversioning/solutions/models/rt.mps index 166c013a6..d6fe526d0 100644 --- a/code/nodeversioning/solutions/models/rt.mps +++ b/code/nodeversioning/solutions/models/rt.mps @@ -7,7 +7,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/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 @@ - + 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..c9188a5d1 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,7 +129,7 @@ - 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..3f7a88ffa 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 @@ - + - + - + 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..d81ddfb05 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 @@ - + 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..9e05b8f08 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 @@ - + - + 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..ed62a2801 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 @@ - + - + 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..4e90760b4 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 @@ - + 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..68586d987 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 @@ - + 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..dfb9eae01 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 @@ - + - + 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..04ef9fa43 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,7 @@ - + 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..be1925481 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 @@ - + 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..ca7a6b68d 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,7 @@ - + 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..847dbed55 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 @@ - - + + - + - + - + - - + + - + 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/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..17ca7ce88 100644 --- 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,7 +66,7 @@ - + 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..6dfb59cf8 100644 --- 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 @@ - - - + + + 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 @@ - + + + + - + + + + diff --git a/docs/extensions/bl-extensions/structure-check.md b/docs/extensions/bl-extensions/structure-check.md index 9b234a06f..b72f0440d 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 a90f51d13..6372b492e 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 | 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