Skip to content

Commit

Permalink
Merge pull request #775 from JetBrains/refactor/rename_languages
Browse files Browse the repository at this point in the history 
Rename first few languages to use the de.itemis.mps prefix
  • Loading branch information
@alexanderpann
alexanderpann authored Feb 22, 2024
2 parents 13dfdf4 + ef56b13 commit ca4bb9b
Show file tree
Hide file tree
Showing 37 changed files with 113 additions and 111 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ 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

Expand Down
10 changes: 5 additions & 5 deletions code/.mps/modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<modulePath path="$PROJECT_DIR$/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.sandbox/com.mbeddr.mpsutil.grammarcells.sandbox.msd" folder="grammarcells" />
<modulePath path="$PROJECT_DIR$/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/com.mbeddr.mpsutil.grammarcells.tests.msd" folder="grammarcells" />
<modulePath path="$PROJECT_DIR$/hacks/languages/de.itemis.mps.nativelibs/de.itemis.mps.nativelibs.mpl" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/languages/de.slisson.mps.hacks.xmodelgen/de.slisson.mps.hacks.xmodelgen.mpl" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/languages/de.itemis.mps.hacks.xmodelgen/de.itemis.mps.hacks.xmodelgen.mpl" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/solutions/de.itemis.mps.nativelibs.loader/de.itemis.mps.nativelibs.loader.msd" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/solutions/de.slisson.mps.hacks.editor/de.slisson.mps.hacks.editor.msd" folder="hacks" />
Expand Down Expand Up @@ -179,9 +179,9 @@
<modulePath path="$PROJECT_DIR$/solutions/de.itemis.model.merge.test.integration/de.itemis.model.merge.test.integration.msd" folder="modelmerger2" />
<modulePath path="$PROJECT_DIR$/solutions/de.itemis.model.merge.test/de.itemis.model.merge.test.msd" folder="modelmerger2" />
<modulePath path="$PROJECT_DIR$/statistics/de.itemis.mps.statistics.mpl" folder="statistics" />
<modulePath path="$PROJECT_DIR$/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl" folder="structurecheck" />
<modulePath path="$PROJECT_DIR$/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/de.slisson.mps.structurecheck.runtime.msd" folder="structurecheck" />
<modulePath path="$PROJECT_DIR$/structurecheck/solutions/de.slisson.mps.structurecheck.sandbox/de.slisson.mps.structurecheck.sandbox.msd" folder="structurecheck" />
<modulePath path="$PROJECT_DIR$/structurecheck/languages/de.itemis.mps.structurecheck/de.itemis.mps.structurecheck.mpl" folder="structurecheck" />
<modulePath path="$PROJECT_DIR$/structurecheck/solutions/de.itemis.mps.structurecheck.runtime/de.itemis.mps.structurecheck.runtime.msd" folder="structurecheck" />
<modulePath path="$PROJECT_DIR$/structurecheck/solutions/de.itemis.mps.structurecheck.sandbox/de.itemis.mps.structurecheck.sandbox.msd" folder="structurecheck" />
<modulePath path="$PROJECT_DIR$/tables/languages/de.slisson.mps.tables.demolang/de.slisson.mps.tables.demolang.mpl" folder="tables" />
<modulePath path="$PROJECT_DIR$/tables/languages/de.slisson.mps.tables/de.slisson.mps.tables.mpl" folder="tables" />
<modulePath path="$PROJECT_DIR$/tables/languages/de.slisson.mps.tables/runtime/de.slisson.mps.tables.runtime.msd" folder="tables" />
Expand All @@ -195,7 +195,7 @@
<modulePath path="$PROJECT_DIR$/treenotation/com.mbeddr.mpsutil.treenotation.sandboxlang/com.mbeddr.mpsutil.treenotation.sandboxlang.mpl" folder="treenotation" />
<modulePath path="$PROJECT_DIR$/treenotation/com.mbeddr.mpsutil.treenotation.styles/com.mbeddr.mpsutil.treenotation.styles.mpl" folder="treenotation" />
<modulePath path="$PROJECT_DIR$/treenotation/com.mbeddr.mpsutil.treenotation/com.mbeddr.mpsutil.treenotation.mpl" folder="treenotation" />
<modulePath path="$PROJECT_DIR$/utils/solutions/com.mbeddr.mpsutil.serializer.xml/com.mbeddr.mpsutil.serializer.xml.msd" folder="utils" />
<modulePath path="$PROJECT_DIR$/utils/solutions/de.itemis.mps.utils.serializer.xml/de.itemis.mps.utils.serializer.xml.msd" folder="utils" />
<modulePath path="$PROJECT_DIR$/utils/solutions/de.itemis.mps.noderversioning.sandbox/de.itemis.mps.noderversioning.sandbox.msd" folder="nodeversioning" />
<modulePath path="$PROJECT_DIR$/widgets/languages/de.itemis.mps.editor.bool.demolang/de.itemis.mps.editor.bool.demolang.mpl" folder="widgets" />
<modulePath path="$PROJECT_DIR$/widgets/languages/de.itemis.mps.editor.bool/de.itemis.mps.editor.bool.mpl" folder="widgets" />
Expand Down
64 changes: 32 additions & 32 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4225,7 +4225,7 @@
<property role="TrG5h" value="de.slisson.mps.hacks" />
<node concept="1E1JtD" id="TAJODzTczI" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="de.slisson.mps.hacks.xmodelgen" />
<property role="TrG5h" value="de.itemis.mps.hacks.xmodelgen" />
<property role="3LESm3" value="c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1" />
<node concept="398BVA" id="TAJODzTcXB" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
Expand All @@ -4234,9 +4234,9 @@
<node concept="2Ry0Ak" id="TAJODzTe13" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="1QLFoGOMSyO" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.hacks.xmodelgen" />
<property role="2Ry0Am" value="de.itemis.mps.hacks.xmodelgen" />
<node concept="2Ry0Ak" id="1QLFoGOMSGv" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.hacks.xmodelgen.mpl" />
<property role="2Ry0Am" value="de.itemis.mps.hacks.xmodelgen.mpl" />
</node>
</node>
</node>
Expand Down Expand Up @@ -4274,7 +4274,7 @@
<node concept="2Ry0Ak" id="nsMIIcsDq5" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="nsMIIcsDq6" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.hacks.xmodelgen" />
<property role="2Ry0Am" value="de.itemis.mps.hacks.xmodelgen" />
</node>
</node>
</node>
Expand All @@ -4298,7 +4298,7 @@
<node concept="2Ry0Ak" id="2eucapX07Pi" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="2eucapX07Pj" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.hacks.xmodelgen" />
<property role="2Ry0Am" value="de.itemis.mps.hacks.xmodelgen" />
<node concept="2Ry0Ak" id="2eucapX07Pk" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
Expand Down Expand Up @@ -6776,7 +6776,7 @@
</node>
<node concept="1SiIV0" id="457TI2XWfLr" role="3bR37C">
<node concept="3bR9La" id="457TI2XWfLs" role="1SiIV1">
<ref role="3bR37D" node="6860Y5A00Lp" resolve="com.mbeddr.mpsutil.serializer.xml" />
<ref role="3bR37D" node="6860Y5A00Lp" resolve="de.itemis.mps.utils.serializer.xml" />
</node>
</node>
<node concept="1SiIV0" id="457TI2XWjJw" role="3bR37C">
Expand Down Expand Up @@ -6874,7 +6874,7 @@
</node>
<node concept="1E1JtA" id="6860Y5A00Lp" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="com.mbeddr.mpsutil.serializer.xml" />
<property role="TrG5h" value="de.itemis.mps.utils.serializer.xml" />
<property role="3LESm3" value="5454dbfd-2075-4de0-b85e-fa645eb6957e" />
<node concept="3rtmxn" id="1bWvPKNGzIa" role="3bR31x">
<node concept="3LXTmp" id="1bWvPKNGzIb" role="3rtmxm">
Expand All @@ -6888,7 +6888,7 @@
<node concept="2Ry0Ak" id="1bWvPKNGzIf" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="1bWvPKNGzIg" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.serializer.xml" />
<property role="2Ry0Am" value="de.itemis.mps.utils.serializer.xml" />
</node>
</node>
</node>
Expand All @@ -6902,9 +6902,9 @@
<node concept="2Ry0Ak" id="6860Y5A031H" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6860Y5A03xM" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.serializer.xml" />
<property role="2Ry0Am" value="de.itemis.mps.utils.serializer.xml" />
<node concept="2Ry0Ak" id="6860Y5A041R" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.serializer.xml.msd" />
<property role="2Ry0Am" value="de.itemis.mps.utils.serializer.xml.msd" />
</node>
</node>
</node>
Expand Down Expand Up @@ -6939,7 +6939,7 @@
<node concept="2Ry0Ak" id="6860Y5A04y3" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6860Y5A04y4" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.serializer.xml" />
<property role="2Ry0Am" value="de.itemis.mps.utils.serializer.xml" />
<node concept="2Ry0Ak" id="6860Y5A04y5" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="6860Y5A04y6" role="2Ry0An">
Expand All @@ -6964,7 +6964,7 @@
<node concept="2Ry0Ak" id="6860Y5A04yk" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6860Y5A04yl" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.serializer.xml" />
<property role="2Ry0Am" value="de.itemis.mps.utils.serializer.xml" />
<node concept="2Ry0Ak" id="6860Y5A04ym" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="6860Y5A04yn" role="2Ry0An">
Expand All @@ -6989,7 +6989,7 @@
<node concept="2Ry0Ak" id="2eucapX080L" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2eucapX080M" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.serializer.xml" />
<property role="2Ry0Am" value="de.itemis.mps.utils.serializer.xml" />
<node concept="2Ry0Ak" id="2eucapX080N" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
Expand Down Expand Up @@ -14584,7 +14584,7 @@
<node concept="2Ry0Ak" id="6860Y5A0A00" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6860Y5A0A05" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.serializer.xml" />
<property role="2Ry0Am" value="de.itemis.mps.utils.serializer.xml" />
<node concept="2Ry0Ak" id="6860Y5A0A0a" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
</node>
Expand Down Expand Up @@ -15115,7 +15115,7 @@
</node>
<node concept="1E1JtA" id="6$6tsX_CURF" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="de.slisson.mps.structurecheck.runtime" />
<property role="TrG5h" value="de.itemis.mps.structurecheck.runtime" />
<property role="3LESm3" value="6f14e29b-9796-426f-ae46-86ea46d4d320" />
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
<node concept="398BVA" id="3vzyAKEK04f" role="3LF7KH">
Expand All @@ -15125,9 +15125,9 @@
<node concept="2Ry0Ak" id="3vzyAKEK04l" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="1QLFoGOMUbK" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.structurecheck.runtime" />
<property role="2Ry0Am" value="de.itemis.mps.structurecheck.runtime" />
<node concept="2Ry0Ak" id="1QLFoGOMUoj" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.structurecheck.runtime.msd" />
<property role="2Ry0Am" value="de.itemis.mps.structurecheck.runtime.msd" />
</node>
</node>
</node>
Expand All @@ -15150,7 +15150,7 @@
<node concept="2Ry0Ak" id="nsMIIcsJ49" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="nsMIIcsJ4a" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.structurecheck.runtime" />
<property role="2Ry0Am" value="de.itemis.mps.structurecheck.runtime" />
</node>
</node>
</node>
Expand All @@ -15169,7 +15169,7 @@
<node concept="2Ry0Ak" id="7q24334ZK$w" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="7q24334ZK$x" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.structurecheck.runtime" />
<property role="2Ry0Am" value="de.itemis.mps.structurecheck.runtime" />
<node concept="2Ry0Ak" id="7q24334ZK$y" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
Expand All @@ -15185,7 +15185,7 @@
</node>
<node concept="1E1JtD" id="6$6tsX_CUvL" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="de.slisson.mps.structurecheck" />
<property role="TrG5h" value="de.itemis.mps.structurecheck" />
<property role="3LESm3" value="c6cfed73-685b-4891-8bdd-b38a1dcb107a" />
<node concept="398BVA" id="3vzyAKEJZkI" role="3LF7KH">
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
Expand All @@ -15194,28 +15194,28 @@
<node concept="2Ry0Ak" id="3vzyAKEJZkO" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="1QLFoGOMUL_" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.structurecheck" />
<property role="2Ry0Am" value="de.itemis.mps.structurecheck" />
<node concept="2Ry0Ak" id="1QLFoGOMUYi" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.structurecheck.mpl" />
<property role="2Ry0Am" value="de.itemis.mps.structurecheck.mpl" />
</node>
</node>
</node>
</node>
</node>
<node concept="1E0d5M" id="6$6tsX_CV3t" role="1E1XAP">
<ref role="1E0d5P" node="6$6tsX_CURF" resolve="de.slisson.mps.structurecheck.runtime" />
<ref role="1E0d5P" node="6$6tsX_CURF" resolve="de.itemis.mps.structurecheck.runtime" />
</node>
<node concept="1SiIV0" id="6$6tsX_CV3u" role="3bR37C">
<node concept="1Busua" id="6$6tsX_CV3v" role="1SiIV1">
<ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="1yeLz9" id="6$6tsX_CV3w" role="1TViLv">
<property role="TrG5h" value="de.slisson.mps.structurecheck#380240910834170735" />
<property role="TrG5h" value="de.itemis.mps.structurecheck#380240910834170735" />
<property role="3LESm3" value="ce4c3eb8-9598-4a3c-a7c0-46a16d2333d9" />
<node concept="1SiIV0" id="6$6tsX_CV3x" role="3bR37C">
<node concept="3bR9La" id="6$6tsX_CV3y" role="1SiIV1">
<ref role="3bR37D" node="6$6tsX_CURF" resolve="de.slisson.mps.structurecheck.runtime" />
<ref role="3bR37D" node="6$6tsX_CURF" resolve="de.itemis.mps.structurecheck.runtime" />
</node>
</node>
<node concept="1SiIV0" id="6yXTMcTUXML" role="3bR37C">
Expand All @@ -15235,7 +15235,7 @@
<node concept="2Ry0Ak" id="7q24334ZK_8" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="7q24334ZK_9" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.structurecheck" />
<property role="2Ry0Am" value="de.itemis.mps.structurecheck" />
<node concept="2Ry0Ak" id="7q24334ZK_a" role="2Ry0An">
<property role="2Ry0Am" value="generator" />
<node concept="2Ry0Ak" id="7q24334ZK_b" role="2Ry0An">
Expand Down Expand Up @@ -15264,7 +15264,7 @@
<node concept="2Ry0Ak" id="PE3B26qlUA" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="PE3B26qlUB" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.structurecheck" />
<property role="2Ry0Am" value="de.itemis.mps.structurecheck" />
</node>
</node>
</node>
Expand All @@ -15283,7 +15283,7 @@
<node concept="2Ry0Ak" id="7q24334ZK$O" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="7q24334ZK$P" role="2Ry0An">
<property role="2Ry0Am" value="de.slisson.mps.structurecheck" />
<property role="2Ry0Am" value="de.itemis.mps.structurecheck" />
<node concept="2Ry0Ak" id="7q24334ZK$Q" role="2Ry0An">
<property role="2Ry0Am" value="languageModels" />
</node>
Expand Down Expand Up @@ -15400,7 +15400,7 @@
</node>
</node>
<node concept="1E0d5M" id="5mH$9t6eA1U" role="1E1XAP">
<ref role="1E0d5P" node="6$6tsX_CURF" resolve="de.slisson.mps.structurecheck.runtime" />
<ref role="1E0d5P" node="6$6tsX_CURF" resolve="de.itemis.mps.structurecheck.runtime" />
</node>
<node concept="1SiIV0" id="5mH$9t6eA1V" role="3bR37C">
<node concept="1Busua" id="5mH$9t6eA1W" role="1SiIV1">
Expand Down Expand Up @@ -19037,7 +19037,7 @@
</node>
</node>
<node concept="1E0d5M" id="5mH$9t6eBsZ" role="1E1XAP">
<ref role="1E0d5P" node="6$6tsX_CURF" resolve="de.slisson.mps.structurecheck.runtime" />
<ref role="1E0d5P" node="6$6tsX_CURF" resolve="de.itemis.mps.structurecheck.runtime" />
</node>
<node concept="3rtmxn" id="5mH$9t6eBt3" role="3bR31x">
<node concept="3LXTmp" id="5mH$9t6eBt4" role="3rtmxm">
Expand Down Expand Up @@ -20063,10 +20063,10 @@
<ref role="L2wRA" node="6$6tsX_CJdr" resolve="test.de.itemis.mps.editor.diagram.solution" />
</node>
<node concept="L2wRC" id="1x_$NGQM_y3" role="39821P">
<ref role="L2wRA" node="6$6tsX_CUvL" resolve="de.slisson.mps.structurecheck" />
<ref role="L2wRA" node="6$6tsX_CUvL" resolve="de.itemis.mps.structurecheck" />
</node>
<node concept="L2wRC" id="1x_$NGQM_$b" role="39821P">
<ref role="L2wRA" node="6$6tsX_CURF" resolve="de.slisson.mps.structurecheck.runtime" />
<ref role="L2wRA" node="6$6tsX_CURF" resolve="de.itemis.mps.structurecheck.runtime" />
</node>
<node concept="L2wRC" id="5mH$9t6eCBc" role="39821P">
<ref role="L2wRA" node="5mH$9t6e_Fl" resolve="test.de.slisson.mps.tables" />
Expand Down
Loading

0 comments on commit ca4bb9b

Please sign in to comment.