Skip to content

Commit

Permalink
Merge pull request #236 from mbeddr/mps/2024.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann authored Nov 13, 2024
2 parents 4d36b37 + 20e8b14 commit 579f392
Show file tree
Hide file tree
Showing 46 changed files with 800 additions and 561 deletions.
3 changes: 2 additions & 1 deletion code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
<entry key="project.migrated.version" value="232" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
<entry key="project.migrated.version" value="241" />
</component>
</project>
6 changes: 3 additions & 3 deletions ...cations/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
<use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="7" />
<use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="8" />
<use id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests" version="1" />
</languages>
<imports>
Expand Down Expand Up @@ -160,7 +160,7 @@
<ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
</node>
<node concept="m$_yC" id="1GhTetdABhp" role="m$_yJ">
<ref role="m$_y1" to="5g2w:2JVMSZMFXh0" resolve="org.mpsqa.clones" />
<ref role="m$_y1" to="5g2w:2JVMSZMFXh0" />
</node>
<node concept="3_J27D" id="2JVMSZMFY9r" role="m_cZH">
<node concept="3Mxwew" id="2JVMSZMFY9s" role="3MwsjC">
Expand Down Expand Up @@ -263,7 +263,7 @@
</node>
</node>
<node concept="2sgV4H" id="6dJ4vxiTR6z" role="1l3spa">
<ref role="1l3spb" to="c9zv:2JVMSZMFXJP" resolve="org.mpsqa.clones.headless" />
<ref role="1l3spb" to="c9zv:2JVMSZMFXJP" resolve="org.mpsqa.clones.tests" />
<node concept="398BVA" id="6dJ4vxiUhxa" role="2JcizS">
<ref role="398BVh" node="1GhTetdB0o4" resolve="mps_home" />
</node>
Expand Down
6 changes: 4 additions & 2 deletions ...qa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/org.mpsqa.clones.demo.build.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,25 @@
</modelRoot>
</models>
<facets>
<facet compile="mps" classes="mps" ext="no" type="java">
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
<dependencies>
<dependency reexport="false">cf9e90bb-6263-4505-b1d0-f6a2339ece89(org.mpsqa.clones.build)</dependency>
<dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
<dependency reexport="false">11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)</dependency>
<dependency reexport="false">5e8cea6b-997f-49b1-a8d8-dc2a7a6fa657(org.mpsqa.base.build)</dependency>
</dependencies>
<languageVersions>
<language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
<language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
<language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="8" />
<language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
</languageVersions>
<dependencyVersions>
<module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
<module reference="5e8cea6b-997f-49b1-a8d8-dc2a7a6fa657(org.mpsqa.base.build)" version="0" />
<module reference="11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)" version="0" />
<module reference="cf9e90bb-6263-4505-b1d0-f6a2339ece89(org.mpsqa.clones.build)" version="0" />
<module reference="3ef108e9-9b3a-4772-a069-c91cd62467de(org.mpsqa.clones.demo.build)" version="0" />
Expand Down
2 changes: 1 addition & 1 deletion ....clones.demo/code/solutions/org.mpsqa.clones.demo.config/org.mpsqa.clones.demo.config.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet compile="mps" classes="mps" ext="no" type="java">
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/classes_gen" />
</facet>
<facet type="tests" />
Expand Down
4 changes: 2 additions & 2 deletions code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@
<node concept="2OqwBi" id="2p0G1uTupu9" role="3clFbG">
<node concept="2OqwBi" id="2p0G1uTuoSo" role="2Oq$k0">
<node concept="37vLTw" id="2p0G1uTuoES" role="2Oq$k0">
<ref role="3cqZAo" node="1vMaDkDXck2" resolve="it" />
<ref role="3cqZAo" node="1vMaDkDXck2" resolve="line" />
</node>
<node concept="2qgKlT" id="2p0G1uTup7i" role="2OqNvi">
<ref role="37wK5l" to="vdrq:WJz9iATjyN" resolve="getTextElements" />
Expand Down Expand Up @@ -1028,7 +1028,7 @@
</node>
</node>
<node concept="gl6BB" id="1vMaDkDXck2" role="1bW2Oz">
<property role="TrG5h" value="it" />
<property role="TrG5h" value="line" />
<node concept="2jxLKc" id="1vMaDkDXck3" role="1tU5fm" />
</node>
</node>
Expand Down
77 changes: 46 additions & 31 deletions code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.util.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,49 +494,64 @@
<property role="TrG5h" value="op" />
</node>
<node concept="3clFbS" id="5ruws_4EC1a" role="2LFqv$">
<node concept="2Gpval" id="5ruws_4EDg4" role="3cqZAp">
<node concept="2GrKxI" id="5ruws_4EDg9" role="2Gsz3X">
<property role="TrG5h" value="pm" />
<node concept="2Gpval" id="3YxxzAUQRzd" role="3cqZAp">
<node concept="2GrKxI" id="3YxxzAUQRzf" role="2Gsz3X">
<property role="TrG5h" value="module" />
</node>
<node concept="3clFbS" id="5ruws_4EDgj" role="2LFqv$">
<node concept="3clFbJ" id="5ruws_4EDqi" role="3cqZAp">
<node concept="2OqwBi" id="5ruws_4EE2y" role="3clFbw">
<node concept="2GrUjf" id="5ruws_4EDqV" role="2Oq$k0">
<ref role="2Gs0qQ" node="5ruws_4EDg9" resolve="pm" />
<node concept="2OqwBi" id="3YxxzAUQSUG" role="2GsD0m">
<node concept="2GrUjf" id="3YxxzAUQS36" role="2Oq$k0">
<ref role="2Gs0qQ" node="5ruws_4EC16" resolve="op" />
</node>
<node concept="liA8E" id="3YxxzAUQTWz" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~IProject.getProjectModules()" resolve="getProjectModules" />
</node>
</node>
<node concept="3clFbS" id="3YxxzAUQRzj" role="2LFqv$">
<node concept="2Gpval" id="3YxxzAUQW1Z" role="3cqZAp">
<node concept="2GrKxI" id="3YxxzAUQW20" role="2Gsz3X">
<property role="TrG5h" value="pm" />
</node>
<node concept="2OqwBi" id="3YxxzAUQXue" role="2GsD0m">
<node concept="2GrUjf" id="3YxxzAUQX1y" role="2Oq$k0">
<ref role="2Gs0qQ" node="3YxxzAUQRzf" resolve="module" />
</node>
<node concept="liA8E" id="5ruws_4EEUZ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="5ruws_4EF5s" role="37wK5m">
<ref role="3cqZAo" node="5ruws_4EDyr" resolve="myModel" />
</node>
<node concept="liA8E" id="3YxxzAUQYQa" role="2OqNvi">
<ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
</node>
</node>
<node concept="3clFbS" id="5ruws_4EDqk" role="3clFbx">
<node concept="3cpWs6" id="2HNHUobr5wO" role="3cqZAp">
<node concept="1rXfSq" id="2HNHUobr5wP" role="3cqZAk">
<ref role="37wK5l" node="5enppyYCuMW" resolve="getProjectModulesNotPartOfArchitectureDescription" />
<node concept="2GrUjf" id="48uyNAv9E$C" role="37wK5m">
<ref role="2Gs0qQ" node="5ruws_4EC16" resolve="op" />
<node concept="3clFbS" id="3YxxzAUQW22" role="2LFqv$">
<node concept="3clFbJ" id="5ruws_4EDqi" role="3cqZAp">
<node concept="2OqwBi" id="5ruws_4EE2y" role="3clFbw">
<node concept="2GrUjf" id="5ruws_4EDqV" role="2Oq$k0">
<ref role="2Gs0qQ" node="3YxxzAUQW20" resolve="pm" />
</node>
<node concept="37vLTw" id="2HNHUobr5wR" role="37wK5m">
<ref role="3cqZAo" node="5enppyYDSO8" resolve="architectureSpec" />
<node concept="liA8E" id="5ruws_4EEUZ" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="37vLTw" id="5ruws_4EF5s" role="37wK5m">
<ref role="3cqZAo" node="5ruws_4EDyr" resolve="myModel" />
</node>
</node>
<node concept="37vLTw" id="48uyNAv734r" role="37wK5m">
<ref role="3cqZAo" node="48uyNAv72rJ" resolve="considerLanguages" />
</node>
<node concept="3clFbS" id="5ruws_4EDqk" role="3clFbx">
<node concept="3cpWs6" id="2HNHUobr5wO" role="3cqZAp">
<node concept="1rXfSq" id="2HNHUobr5wP" role="3cqZAk">
<ref role="37wK5l" node="5enppyYCuMW" resolve="getProjectModulesNotPartOfArchitectureDescription" />
<node concept="2GrUjf" id="48uyNAv9E$C" role="37wK5m">
<ref role="2Gs0qQ" node="5ruws_4EC16" resolve="op" />
</node>
<node concept="37vLTw" id="2HNHUobr5wR" role="37wK5m">
<ref role="3cqZAo" node="5enppyYDSO8" resolve="architectureSpec" />
</node>
<node concept="37vLTw" id="48uyNAv734r" role="37wK5m">
<ref role="3cqZAo" node="48uyNAv72rJ" resolve="considerLanguages" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="5ruws_4ECu_" role="2GsD0m">
<node concept="2GrUjf" id="5ruws_4ECg_" role="2Oq$k0">
<ref role="2Gs0qQ" node="5ruws_4EC16" resolve="op" />
</node>
<node concept="liA8E" id="5ruws_4ED2o" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getProjectModels()" resolve="getProjectModels" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="2HNHUobr1F8" role="2GsD0m">
Expand Down
Loading

0 comments on commit 579f392

Please sign in to comment.