Skip to content

Commit 7a0c5b6

Browse files
author
Alexander Pann
authored
Merge pull request #1080 from JetBrains/bugfix/projects_views_util_class
2 parents 2e5e30a + 2c01212 commit 7a0c5b6

File tree

7 files changed

+1311
-1081
lines changed

7 files changed

+1311
-1081
lines changed

‎code/.mps/modules.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
<modulePath path="$PROJECT_DIR$/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.nestedlist.sandbox/com.dslfoundry.plaintextgen.example.nestedlist.sandbox.msd" folder="plaintextgen" />
130130
<modulePath path="$PROJECT_DIR$/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.plaintextflow/com.dslfoundry.plaintextgen.example.plaintextflow.msd" folder="plaintextgen" />
131131
<modulePath path="$PROJECT_DIR$/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.testlang.sandbox/com.dslfoundry.plaintextgen.example.testlang.sandbox.msd" folder="plaintextgen" />
132+
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.demo/com.mbeddr.mpsutil.projectview.demo.msd" folder="projectview" />
132133
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd" folder="projectview" />
133134
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.vcs/com.mbeddr.mpsutil.projectview.vcs.msd" folder="projectview" />
134135
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.views/com.mbeddr.mpsutil.projectview.views.msd" folder="projectview" />

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15336,6 +15336,86 @@
1533615336
</node>
1533715337
</node>
1533815338
</node>
15339+
<node concept="1E1JtA" id="3jVbLyZDuHs" role="2G$12L">
15340+
<property role="BnDLt" value="true" />
15341+
<property role="TrG5h" value="com.mbeddr.mpsutil.projectview.views" />
15342+
<property role="3LESm3" value="5c67d0a6-96e9-4056-be57-e594d54526b0" />
15343+
<node concept="3rtmxn" id="3xFG3bj5cMH" role="3bR31x">
15344+
<node concept="3LXTmp" id="3xFG3bj5cMI" role="3rtmxm">
15345+
<node concept="3qWCbU" id="3xFG3bj5cMJ" role="3LXTna">
15346+
<property role="3qWCbO" value="icons/**, resources/**" />
15347+
</node>
15348+
<node concept="398BVA" id="3xFG3bj5cMK" role="3LXTmr">
15349+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
15350+
<node concept="2Ry0Ak" id="3xFG3bj5cML" role="iGT6I">
15351+
<property role="2Ry0Am" value="projectview" />
15352+
<node concept="2Ry0Ak" id="3xFG3bj5cMM" role="2Ry0An">
15353+
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views" />
15354+
</node>
15355+
</node>
15356+
</node>
15357+
</node>
15358+
</node>
15359+
<node concept="398BVA" id="3jVbLyZDwm6" role="3LF7KH">
15360+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
15361+
<node concept="2Ry0Ak" id="3jVbLyZDxDY" role="iGT6I">
15362+
<property role="2Ry0Am" value="projectview" />
15363+
<node concept="2Ry0Ak" id="3jVbLyZDyXP" role="2Ry0An">
15364+
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views" />
15365+
<node concept="2Ry0Ak" id="3jVbLyZD$hG" role="2Ry0An">
15366+
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views.msd" />
15367+
</node>
15368+
</node>
15369+
</node>
15370+
</node>
15371+
<node concept="1SiIV0" id="3jVbLyZD$VB" role="3bR37C">
15372+
<node concept="3bR9La" id="3jVbLyZD$VC" role="1SiIV1">
15373+
<ref role="3bR37D" to="ffeo:2eDSGe9d1q1" resolve="MPS.Workbench" />
15374+
</node>
15375+
</node>
15376+
<node concept="1SiIV0" id="3jVbLyZD$VJ" role="3bR37C">
15377+
<node concept="3bR9La" id="3jVbLyZD$VK" role="1SiIV1">
15378+
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
15379+
</node>
15380+
</node>
15381+
<node concept="1SiIV0" id="3jVbLyZD$VL" role="3bR37C">
15382+
<node concept="3bR9La" id="3jVbLyZD$VM" role="1SiIV1">
15383+
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
15384+
</node>
15385+
</node>
15386+
<node concept="1SiIV0" id="3jVbLyZD$VP" role="3bR37C">
15387+
<node concept="3bR9La" id="3jVbLyZD$VQ" role="1SiIV1">
15388+
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
15389+
</node>
15390+
</node>
15391+
<node concept="1SiIV0" id="2avgMTl5svn" role="3bR37C">
15392+
<node concept="3bR9La" id="2avgMTl5svo" role="1SiIV1">
15393+
<ref role="3bR37D" node="PE3B26QCrP" resolve="org.apache.commons" />
15394+
</node>
15395+
</node>
15396+
<node concept="1BupzO" id="4PRpvcZJNMx" role="3bR31x">
15397+
<property role="3ZfqAx" value="models" />
15398+
<property role="1Hdu6h" value="true" />
15399+
<property role="1HemKv" value="true" />
15400+
<node concept="3LXTmp" id="4PRpvcZJNMy" role="1HemKq">
15401+
<node concept="398BVA" id="4PRpvcZJNMm" role="3LXTmr">
15402+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
15403+
<node concept="2Ry0Ak" id="4PRpvcZJNMn" role="iGT6I">
15404+
<property role="2Ry0Am" value="projectview" />
15405+
<node concept="2Ry0Ak" id="4PRpvcZJNMo" role="2Ry0An">
15406+
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views" />
15407+
<node concept="2Ry0Ak" id="4PRpvcZJNMp" role="2Ry0An">
15408+
<property role="2Ry0Am" value="models" />
15409+
</node>
15410+
</node>
15411+
</node>
15412+
</node>
15413+
<node concept="3qWCbU" id="4PRpvcZJNMz" role="3LXTna">
15414+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
15415+
</node>
15416+
</node>
15417+
</node>
15418+
</node>
1533915419
</node>
1534015420
<node concept="m$_wf" id="24ObHxTzV4S" role="3989C9">
1534115421
<property role="m$_wk" value="com.mbeddr.mpsutil.projectview.vcs" />

‎code/projectview/com.mbeddr.mpsutil.projectview.demo/com.mbeddr.mpsutil.projectview.demo.msd‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<solution name="com.mbeddr.mpsutil.projectview.demo" uuid="35f54441-1f2a-45c1-a031-f8bb10fc9c6b" moduleVersion="0">
3+
<models>
4+
<modelRoot type="default" contentPath="${module}">
5+
<sourceRoot location="models" />
6+
</modelRoot>
7+
</models>
8+
<facets>
9+
<facet compile="mps" classes="mps" ext="yes" type="java">
10+
<classes generated="true" path="${module}/classes_gen" />
11+
</facet>
12+
</facets>
13+
<dependencies>
14+
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
15+
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
16+
<dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
17+
<dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
18+
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
19+
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
20+
<dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
21+
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
22+
<dependency reexport="false">5c67d0a6-96e9-4056-be57-e594d54526b0(com.mbeddr.mpsutil.projectview.views)</dependency>
23+
</dependencies>
24+
<languageVersions>
25+
<language slang="l:1f1b4a81-113d-4b88-9b67-2bae3e4f8128:com.mbeddr.mpsutil.projectview" version="1" />
26+
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
27+
<language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
28+
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
29+
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
30+
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
31+
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
32+
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
33+
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
34+
</languageVersions>
35+
<dependencyVersions>
36+
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
37+
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
38+
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
39+
<module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
40+
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
41+
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
42+
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
43+
<module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
44+
<module reference="35f54441-1f2a-45c1-a031-f8bb10fc9c6b(com.mbeddr.mpsutil.projectview.demo)" version="0" />
45+
<module reference="5c67d0a6-96e9-4056-be57-e594d54526b0(com.mbeddr.mpsutil.projectview.views)" version="0" />
46+
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
47+
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
48+
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
49+
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
50+
<module reference="b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)" version="0" />
51+
</dependencyVersions>
52+
</solution>
53+

0 commit comments

Comments
 (0)