Skip to content

Commit 23869ff

Browse files
HeikoBeckerHeikoBecker
committed
Rework the presentation of units/iunits
This simplification focusses on important information.
1 parent f5353a2 commit 23869ff

File tree

1 file changed

+76
-113
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models

1 file changed

+76
-113
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/behavior.mps‎

Lines changed: 76 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
3737
<import index="4kwy" ref="r:657c9fde-2f36-4e61-ae17-20f02b8630ad(org.iets3.core.base.structure)" />
3838
<import index="b1h1" ref="r:ac5f749f-6179-4d4f-ad24-ad9edbd8077b(org.iets3.core.expr.simpleTypes.behavior)" implicit="true" />
39-
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
4039
</imports>
4140
<registry>
4241
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -340,14 +339,9 @@
340339
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
341340
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
342341
</concept>
343-
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
344342
<concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
345343
<reference id="1145383142433" name="elementConcept" index="2I9WkF" />
346344
</concept>
347-
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
348-
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
349-
</concept>
350-
<concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
351345
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
352346
<concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
353347
<concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
@@ -1289,83 +1283,43 @@
12891283
</node>
12901284
</node>
12911285
<node concept="3cpWs6" id="2Ux6GHgX$Ku" role="3cqZAp">
1292-
<node concept="3cpWs3" id="J6oDkVJgYd" role="3cqZAk">
1293-
<node concept="2OqwBi" id="J6oDkVJf6L" role="3uHU7w">
1294-
<node concept="2OqwBi" id="J6oDkVJe0C" role="2Oq$k0">
1295-
<node concept="2OqwBi" id="J6oDkVJcKC" role="2Oq$k0">
1296-
<node concept="13iPFW" id="J6oDkVJcx0" role="2Oq$k0" />
1297-
<node concept="3TrEf2" id="J6oDkVJdGn" role="2OqNvi">
1298-
<ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
1299-
</node>
1286+
<node concept="3cpWs3" id="2Ux6GHgX$Kv" role="3cqZAk">
1287+
<node concept="2OqwBi" id="2Ux6GHgX$KF" role="3uHU7B">
1288+
<node concept="2OqwBi" id="2Ux6GHgX$KG" role="2Oq$k0">
1289+
<node concept="13iPFW" id="2Ux6GHgX$KH" role="2Oq$k0" />
1290+
<node concept="3TrEf2" id="2Ux6GHgX$KI" role="2OqNvi">
1291+
<ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
13001292
</node>
1301-
<node concept="2Rxl7S" id="J6oDkVJeWz" role="2OqNvi" />
13021293
</node>
1303-
<node concept="2qgKlT" id="J6oDkVJfZe" role="2OqNvi">
1294+
<node concept="2qgKlT" id="2Ux6GHgX$KJ" role="2OqNvi">
13041295
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
13051296
</node>
13061297
</node>
1307-
<node concept="3cpWs3" id="J6oDkVJcbm" role="3uHU7B">
1308-
<node concept="3cpWs3" id="J6oDkVJaM$" role="3uHU7B">
1309-
<node concept="3cpWs3" id="J6oDkVI_UL" role="3uHU7B">
1310-
<node concept="3cpWs3" id="2Ux6GHgX$Kv" role="3uHU7B">
1311-
<node concept="2OqwBi" id="2Ux6GHgX$KF" role="3uHU7B">
1312-
<node concept="2OqwBi" id="2Ux6GHgX$KG" role="2Oq$k0">
1313-
<node concept="13iPFW" id="2Ux6GHgX$KH" role="2Oq$k0" />
1314-
<node concept="3TrEf2" id="2Ux6GHgX$KI" role="2OqNvi">
1315-
<ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
1316-
</node>
1317-
</node>
1318-
<node concept="2qgKlT" id="2Ux6GHgX$KJ" role="2OqNvi">
1319-
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
1320-
</node>
1321-
</node>
1322-
<node concept="1eOMI4" id="2Ux6GHgX$Kw" role="3uHU7w">
1323-
<node concept="3K4zz7" id="2Ux6GHgX$Kx" role="1eOMHV">
1324-
<node concept="2OqwBi" id="2Ux6GHgX$Ky" role="3K4Cdx">
1325-
<node concept="37vLTw" id="2Ux6GHgX$Kz" role="2Oq$k0">
1326-
<ref role="3cqZAo" node="lqDNwvmrgZ" resolve="exp" />
1327-
</node>
1328-
<node concept="17RlXB" id="2Ux6GHgX$K$" role="2OqNvi" />
1329-
</node>
1330-
<node concept="Xl_RD" id="2Ux6GHgX$K_" role="3K4E3e">
1331-
<property role="Xl_RC" value="" />
1332-
</node>
1333-
<node concept="3cpWs3" id="2Ux6GHgX$KA" role="3K4GZi">
1334-
<node concept="Xl_RD" id="2Ux6GHgX$KB" role="3uHU7w">
1335-
<property role="Xl_RC" value=")" />
1336-
</node>
1337-
<node concept="3cpWs3" id="2Ux6GHgX$KC" role="3uHU7B">
1338-
<node concept="Xl_RD" id="2Ux6GHgX$KD" role="3uHU7B">
1339-
<property role="Xl_RC" value="^(" />
1340-
</node>
1341-
<node concept="37vLTw" id="2Ux6GHgX$KE" role="3uHU7w">
1342-
<ref role="3cqZAo" node="lqDNwvmrgZ" resolve="exp" />
1343-
</node>
1344-
</node>
1345-
</node>
1346-
</node>
1347-
</node>
1348-
</node>
1349-
<node concept="Xl_RD" id="J6oDkVJb7O" role="3uHU7w">
1350-
<property role="Xl_RC" value=" in " />
1298+
<node concept="1eOMI4" id="2Ux6GHgX$Kw" role="3uHU7w">
1299+
<node concept="3K4zz7" id="2Ux6GHgX$Kx" role="1eOMHV">
1300+
<node concept="2OqwBi" id="2Ux6GHgX$Ky" role="3K4Cdx">
1301+
<node concept="37vLTw" id="2Ux6GHgX$Kz" role="2Oq$k0">
1302+
<ref role="3cqZAo" node="lqDNwvmrgZ" resolve="exp" />
13511303
</node>
1304+
<node concept="17RlXB" id="2Ux6GHgX$K$" role="2OqNvi" />
13521305
</node>
1353-
<node concept="2OqwBi" id="J6oDkVIB3C" role="3uHU7w">
1354-
<node concept="2OqwBi" id="J6oDkVJ9vv" role="2Oq$k0">
1355-
<node concept="2OqwBi" id="J6oDkVIAyY" role="2Oq$k0">
1356-
<node concept="13iPFW" id="J6oDkVIAjN" role="2Oq$k0" />
1357-
<node concept="3TrEf2" id="J6oDkVJ8Fv" role="2OqNvi">
1358-
<ref role="3Tt5mk" to="b0gq:7eOyx9r3qFW" resolve="unit" />
1359-
</node>
1306+
<node concept="Xl_RD" id="2Ux6GHgX$K_" role="3K4E3e">
1307+
<property role="Xl_RC" value="" />
1308+
</node>
1309+
<node concept="3cpWs3" id="2Ux6GHgX$KA" role="3K4GZi">
1310+
<node concept="Xl_RD" id="2Ux6GHgX$KB" role="3uHU7w">
1311+
<property role="Xl_RC" value=")" />
1312+
</node>
1313+
<node concept="3cpWs3" id="2Ux6GHgX$KC" role="3uHU7B">
1314+
<node concept="Xl_RD" id="2Ux6GHgX$KD" role="3uHU7B">
1315+
<property role="Xl_RC" value="^(" />
1316+
</node>
1317+
<node concept="37vLTw" id="2Ux6GHgX$KE" role="3uHU7w">
1318+
<ref role="3cqZAo" node="lqDNwvmrgZ" resolve="exp" />
13601319
</node>
1361-
<node concept="I4A8Y" id="J6oDkVJatK" role="2OqNvi" />
13621320
</node>
1363-
<node concept="LkI2h" id="J6oDkVIBfI" role="2OqNvi" />
13641321
</node>
13651322
</node>
1366-
<node concept="Xl_RD" id="J6oDkVJhnc" role="3uHU7w">
1367-
<property role="Xl_RC" value="/" />
1368-
</node>
13691323
</node>
13701324
</node>
13711325
</node>
@@ -1426,6 +1380,38 @@
14261380
</node>
14271381
<node concept="17QB3L" id="3WnwFDbcwIP" role="3clF45" />
14281382
</node>
1383+
<node concept="13i0hz" id="49jLf4T77Vf" role="13h7CS">
1384+
<property role="TrG5h" value="getPresentation" />
1385+
<ref role="13i0hy" to="tpcu:hEwIMiw" resolve="getPresentation" />
1386+
<node concept="3Tm1VV" id="49jLf4T77VE" role="1B3o_S" />
1387+
<node concept="3clFbS" id="49jLf4T793U" role="3clF47">
1388+
<node concept="3cpWs6" id="49jLf4T79Eb" role="3cqZAp">
1389+
<node concept="3cpWs3" id="49jLf4T7dcg" role="3cqZAk">
1390+
<node concept="2OqwBi" id="49jLf4T7dEY" role="3uHU7w">
1391+
<node concept="13iPFW" id="49jLf4T7dlq" role="2Oq$k0" />
1392+
<node concept="3TrcHB" id="49jLf4T7emA" role="2OqNvi">
1393+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
1394+
</node>
1395+
</node>
1396+
<node concept="3cpWs3" id="49jLf4T7cJP" role="3uHU7B">
1397+
<node concept="2OqwBi" id="49jLf4T7bFG" role="3uHU7B">
1398+
<node concept="2OqwBi" id="49jLf4T79YW" role="2Oq$k0">
1399+
<node concept="13iPFW" id="49jLf4T79EF" role="2Oq$k0" />
1400+
<node concept="2Rxl7S" id="49jLf4T7bqZ" role="2OqNvi" />
1401+
</node>
1402+
<node concept="2qgKlT" id="49jLf4T7cpp" role="2OqNvi">
1403+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
1404+
</node>
1405+
</node>
1406+
<node concept="Xl_RD" id="49jLf4T7cKD" role="3uHU7w">
1407+
<property role="Xl_RC" value="." />
1408+
</node>
1409+
</node>
1410+
</node>
1411+
</node>
1412+
</node>
1413+
<node concept="17QB3L" id="49jLf4T793V" role="3clF45" />
1414+
</node>
14291415
</node>
14301416
<node concept="13h7C7" id="6Mx2Tmonp$n">
14311417
<property role="3GE5qa" value="definition" />
@@ -1936,51 +1922,29 @@
19361922
<node concept="1bVj0M" id="5sKgdctVKP2" role="23t8la">
19371923
<node concept="3clFbS" id="5sKgdctVKP3" role="1bW5cS">
19381924
<node concept="3clFbF" id="5sKgdctVL$E" role="3cqZAp">
1939-
<node concept="3cpWs3" id="5sKgdcu1SSl" role="3clFbG">
1940-
<node concept="2OqwBi" id="5sKgdcu20Hb" role="3uHU7w">
1941-
<node concept="2OqwBi" id="5sKgdcu1XTe" role="2Oq$k0">
1942-
<node concept="37vLTw" id="5sKgdcu1TOp" role="2Oq$k0">
1943-
<ref role="3cqZAo" node="5sKgdctVKP4" resolve="it" />
1944-
</node>
1945-
<node concept="2Rxl7S" id="5sKgdcu1ZO6" role="2OqNvi" />
1946-
</node>
1947-
<node concept="2qgKlT" id="5sKgdcu21HY" role="2OqNvi">
1948-
<ref role="37wK5l" to="tpcu:22G2W3WJ92t" resolve="getDetailedPresentation" />
1925+
<node concept="3cpWs3" id="49jLf4T7gxl" role="3clFbG">
1926+
<node concept="3cpWs3" id="49jLf4T7qvG" role="3uHU7B">
1927+
<node concept="Xl_RD" id="49jLf4T7rqu" role="3uHU7w">
1928+
<property role="Xl_RC" value="." />
19491929
</node>
1950-
</node>
1951-
<node concept="3cpWs3" id="5sKgdctW0nF" role="3uHU7B">
1952-
<node concept="3cpWs3" id="5sKgdctVUQa" role="3uHU7B">
1953-
<node concept="3cpWs3" id="5sKgdctVRHY" role="3uHU7B">
1954-
<node concept="2OqwBi" id="5sKgdctVOj_" role="3uHU7B">
1955-
<node concept="37vLTw" id="5sKgdctVL$D" role="2Oq$k0">
1956-
<ref role="3cqZAo" node="5sKgdctVKP4" resolve="it" />
1957-
</node>
1958-
<node concept="3TrcHB" id="5sKgdctVQyp" role="2OqNvi">
1959-
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
1960-
</node>
1961-
</node>
1962-
<node concept="Xl_RD" id="5sKgdctVSzH" role="3uHU7w">
1963-
<property role="Xl_RC" value=" in " />
1930+
<node concept="2OqwBi" id="49jLf4T7o5E" role="3uHU7B">
1931+
<node concept="2OqwBi" id="49jLf4T7ia7" role="2Oq$k0">
1932+
<node concept="37vLTw" id="49jLf4T7hsJ" role="2Oq$k0">
1933+
<ref role="3cqZAo" node="5sKgdctVKP4" resolve="it" />
19641934
</node>
1935+
<node concept="2Rxl7S" id="49jLf4T7n0Z" role="2OqNvi" />
19651936
</node>
1966-
<node concept="2OqwBi" id="5sKgdcu1dYe" role="3uHU7w">
1967-
<node concept="2OqwBi" id="5sKgdctVWwA" role="2Oq$k0">
1968-
<node concept="liA8E" id="5sKgdctVYyQ" role="2OqNvi">
1969-
<ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
1970-
</node>
1971-
<node concept="2JrnkZ" id="5sKgdctVWwF" role="2Oq$k0">
1972-
<node concept="37vLTw" id="5sKgdctVVwi" role="2JrQYb">
1973-
<ref role="3cqZAo" node="5sKgdctVKP4" resolve="it" />
1974-
</node>
1975-
</node>
1976-
</node>
1977-
<node concept="liA8E" id="5sKgdcu1fi6" role="2OqNvi">
1978-
<ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
1979-
</node>
1937+
<node concept="2qgKlT" id="49jLf4T7pzz" role="2OqNvi">
1938+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
19801939
</node>
19811940
</node>
1982-
<node concept="Xl_RD" id="5sKgdctW1hD" role="3uHU7w">
1983-
<property role="Xl_RC" value="/" />
1941+
</node>
1942+
<node concept="2OqwBi" id="5sKgdctVOj_" role="3uHU7w">
1943+
<node concept="37vLTw" id="5sKgdctVL$D" role="2Oq$k0">
1944+
<ref role="3cqZAo" node="5sKgdctVKP4" resolve="it" />
1945+
</node>
1946+
<node concept="3TrcHB" id="5sKgdctVQyp" role="2OqNvi">
1947+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
19841948
</node>
19851949
</node>
19861950
</node>
@@ -2201,7 +2165,6 @@
22012165
</node>
22022166
</node>
22032167
</node>
2204-
<node concept="3clFbH" id="5XaocLWMbFP" role="3cqZAp" />
22052168
<node concept="3clFbH" id="5XaocLWMlDw" role="3cqZAp" />
22062169
<node concept="3cpWs6" id="5XaocLWF07i" role="3cqZAp">
22072170
<node concept="10Nm6u" id="5XaocLWF07j" role="3cqZAk" />

0 commit comments

Comments
 (0)