Skip to content

Commit

Permalink
RC45 commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielstieger
danielstieger committed Jun 8, 2018
1 parent 0476e92 commit b9aa48c
Show file tree
Hide file tree
Showing 11 changed files with 292 additions and 39 deletions.
80 changes: 80 additions & 0 deletions dataux/languages/org.modellwerkstatt.dataux/generator/template/main@generator.mps
View file
Expand Up @@ -1456,6 +1456,44 @@
</node>
</node>
</node>
<node concept="3clFbH" id="3scH5FpdxO2" role="3cqZAp" />
<node concept="3clFbF" id="3scH5Fpd$cl" role="3cqZAp">
<node concept="2OqwBi" id="3scH5Fpd$Pf" role="3clFbG">
<node concept="37vLTw" id="3scH5Fpd$cj" role="2Oq$k0">
<ref role="3cqZAo" node="IAiV2OfT9a" resolve="childrenNoIncludes" />
</node>
<node concept="liA8E" id="3scH5Fpd_xh" role="2OqNvi">
<ref role="37wK5l" to="yg8v:4xjkqfyaUVo" resolve="forceNotEditable" />
</node>
</node>
<node concept="1W57fq" id="3scH5FpdA5u" role="lGtFl">
<node concept="3IZrLx" id="3scH5FpdA5w" role="3IZSJc">
<node concept="3clFbS" id="3scH5FpdA5y" role="2VODD2">
<node concept="3clFbF" id="3scH5FpdBbO" role="3cqZAp">
<node concept="1Wc70l" id="3scH5FpdBN0" role="3clFbG">
<node concept="2OqwBi" id="3scH5FpdC4O" role="3uHU7w">
<node concept="1PxgMI" id="3scH5FpdBUz" role="2Oq$k0">
<ref role="1PxNhF" to="1btx:2zZnBEDyOcE" resolve="Include" />
<node concept="30H73N" id="3scH5FpdBPp" role="1PxMeX" />
</node>
<node concept="2qgKlT" id="3scH5FpdCi1" role="2OqNvi">
<ref role="37wK5l" to="5y3p:pQ21WN5qNU" resolve="isEditingDisabled" />
</node>
</node>
<node concept="2OqwBi" id="3scH5FpdBg5" role="3uHU7B">
<node concept="30H73N" id="3scH5FpdBbN" role="2Oq$k0" />
<node concept="1mIQ4w" id="3scH5FpdBCH" role="2OqNvi">
<node concept="chp4Y" id="3scH5FpdBGw" role="cj9EA">
<ref role="cht4Q" to="1btx:2zZnBEDyOcE" resolve="Include" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFb_" id="IAiV2OeF_y" role="jymVt">
Expand Down Expand Up @@ -6386,6 +6424,48 @@
</node>
</node>
</node>
<node concept="3clFbH" id="3scH5FpdCvF" role="3cqZAp" />
<node concept="3clFbF" id="3scH5FpdD$S" role="3cqZAp">
<node concept="2OqwBi" id="3scH5FpdD$T" role="3clFbG">
<node concept="37vLTw" id="3scH5FpdEuD" role="2Oq$k0">
<ref role="3cqZAo" node="4Sq2cvDpGcq" resolve="child" />
</node>
<node concept="liA8E" id="3scH5FpdD$V" role="2OqNvi">
<ref role="37wK5l" to="yg8v:4xjkqfyaUVo" resolve="forceNotEditable" />
</node>
</node>
<node concept="1W57fq" id="3scH5FpdD$W" role="lGtFl">
<node concept="3IZrLx" id="3scH5FpdD$X" role="3IZSJc">
<node concept="3clFbS" id="3scH5FpdD$Y" role="2VODD2">
<node concept="3clFbF" id="3scH5FpdH1G" role="3cqZAp">
<node concept="1Wc70l" id="3scH5FpdHDA" role="3clFbG">
<node concept="2OqwBi" id="3scH5FpdIZD" role="3uHU7w">
<node concept="1PxgMI" id="3scH5FpdIGS" role="2Oq$k0">
<ref role="1PxNhF" to="1btx:2zZnBEDyOcE" resolve="Include" />
<node concept="2OqwBi" id="3scH5FpdHRb" role="1PxMeX">
<node concept="30H73N" id="3scH5FpdHIk" role="2Oq$k0" />
<node concept="3TrEf2" id="3scH5FpdI9S" role="2OqNvi">
<ref role="3Tt5mk" to="1btx:2zZnBEDxRoV" />
</node>
</node>
</node>
<node concept="2qgKlT" id="3scH5FpdJn6" role="2OqNvi">
<ref role="37wK5l" to="5y3p:pQ21WN5qNU" resolve="isEditingDisabled" />
</node>
</node>
<node concept="2OqwBi" id="3scH5FpdH9r" role="3uHU7B">
<node concept="30H73N" id="3scH5FpdH1E" role="2Oq$k0" />
<node concept="2qgKlT" id="3scH5FpdHqX" role="2OqNvi">
<ref role="37wK5l" to="5y3p:4mZSGsbWTqf" resolve="hasInclude" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="3scH5FpdD1T" role="3cqZAp" />
</node>
</node>
<node concept="2tJIrI" id="21Qe5t1Vskg" role="jymVt" />
Expand Down
48 changes: 43 additions & 5 deletions dataux/languages/org.modellwerkstatt.dataux/models/constraints.mps
View file
Expand Up @@ -619,11 +619,21 @@
<node concept="nKS2y" id="pQ21WN5qBa" role="1MLUbF">
<node concept="3clFbS" id="pQ21WN5qBb" role="2VODD2">
<node concept="3clFbF" id="pQ21WN5qEu" role="3cqZAp">
<node concept="2OqwBi" id="pQ21WN5qGf" role="3clFbG">
<node concept="nLn13" id="pQ21WN5qEt" role="2Oq$k0" />
<node concept="1mIQ4w" id="pQ21WN5qJ1" role="2OqNvi">
<node concept="chp4Y" id="pQ21WN5qL7" role="cj9EA">
<ref role="cht4Q" to="1btx:6MSPLZmFnKF" resolve="DelegateForm" />
<node concept="22lmx$" id="3scH5Fp8upv" role="3clFbG">
<node concept="2OqwBi" id="3scH5Fp8uwE" role="3uHU7w">
<node concept="nLn13" id="3scH5Fp8usH" role="2Oq$k0" />
<node concept="1mIQ4w" id="3scH5Fp8uAF" role="2OqNvi">
<node concept="chp4Y" id="3scH5Fp8uEi" role="cj9EA">
<ref role="cht4Q" to="1btx:2zZnBEDyOcE" resolve="Include" />
</node>
</node>
</node>
<node concept="2OqwBi" id="pQ21WN5qGf" role="3uHU7B">
<node concept="nLn13" id="pQ21WN5qEt" role="2Oq$k0" />
<node concept="1mIQ4w" id="pQ21WN5qJ1" role="2OqNvi">
<node concept="chp4Y" id="pQ21WN5qL7" role="cj9EA">
<ref role="cht4Q" to="1btx:6MSPLZmFnKF" resolve="DelegateForm" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -1306,5 +1316,33 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="3scH5FpaPZq">
<property role="3GE5qa" value="formopt" />
<ref role="1M2myG" to="1btx:pQ21WN5qog" resolve="LabelFOption" />
<node concept="nKS2y" id="3scH5FpaPZy" role="1MLUbF">
<node concept="3clFbS" id="3scH5FpaPZz" role="2VODD2">
<node concept="3clFbF" id="3scH5FpaQ0Q" role="3cqZAp">
<node concept="22lmx$" id="3scH5FpaQqZ" role="3clFbG">
<node concept="2OqwBi" id="3scH5FpaQyj" role="3uHU7w">
<node concept="nLn13" id="3scH5FpaQue" role="2Oq$k0" />
<node concept="1mIQ4w" id="3scH5FpaQBs" role="2OqNvi">
<node concept="chp4Y" id="3scH5FpaQFb" role="cj9EA">
<ref role="cht4Q" to="1btx:6MSPLZmFnKF" resolve="DelegateForm" />
</node>
</node>
</node>
<node concept="2OqwBi" id="3scH5FpaQ3f" role="3uHU7B">
<node concept="nLn13" id="3scH5FpaQ0P" role="2Oq$k0" />
<node concept="1mIQ4w" id="3scH5FpaQ68" role="2OqNvi">
<node concept="chp4Y" id="3scH5FpaQ8l" role="cj9EA">
<ref role="cht4Q" to="1btx:6MSPLZmFnKD" resolve="Table" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</model>

9 changes: 9 additions & 0 deletions dataux/languages/org.modellwerkstatt.dataux/models/editor.mps
View file
Expand Up @@ -978,6 +978,15 @@
<node concept="PMmxH" id="7rG0OCcHbOM" role="3EZMnx">
<ref role="PMmxG" node="7rG0OCdhRYh" resolve="BindsObjectEditorWithoutIdentifier" />
</node>
<node concept="PMmxH" id="3scH5FpaHW8" role="3EZMnx">
<ref role="PMmxG" node="pQ21WN5sjj" resolve="FormOptionEditor" />
<node concept="pVoyu" id="3scH5FpaHWC" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="lj46D" id="3scH5FpaHWM" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="PMmxH" id="MP9H4j$U0s" role="3EZMnx">
<ref role="PMmxG" node="1xbJ1snAn6A" resolve="MenuEditor" />
<node concept="pVoyu" id="MP9H4j$U1X" role="3F10Kt">
Expand Down
3 changes: 3 additions & 0 deletions dataux/languages/org.modellwerkstatt.dataux/models/structure.mps
View file
Expand Up @@ -369,6 +369,9 @@
<node concept="PrWs8" id="MP9H4j$TXA" role="PzmwI">
<ref role="PrY4T" node="1xbJ1snAn6u" resolve="IHasMenu" />
</node>
<node concept="PrWs8" id="3scH5Fp8txR" role="PzmwI">
<ref role="PrY4T" node="pQ21WN5qo7" resolve="IHasFormOptions" />
</node>
</node>
<node concept="1TIwiD" id="1h$q6rwmHiS">
<property role="1pbfSe" value="188793570" />
Expand Down
41 changes: 40 additions & 1 deletion dataux/languages/org.modellwerkstatt.dataux/models/typesystem.mps
View file
Expand Up @@ -1118,7 +1118,46 @@
</node>
</node>
</node>
<node concept="3clFbH" id="7rG0OCdjRF1" role="3cqZAp" />
</node>
</node>
<node concept="3clFbH" id="3scH5Fpc4Aw" role="3cqZAp" />
<node concept="3clFbJ" id="3scH5Fpc4Pm" role="3cqZAp">
<node concept="3clFbS" id="3scH5Fpc4Po" role="3clFbx">
<node concept="2MkqsV" id="3scH5Fpc8FZ" role="3cqZAp">
<node concept="Xl_RD" id="3scH5Fpc8Ge" role="2MkJ7o">
<property role="Xl_RC" value="The disabled option can only be applied to DelegateForms." />
</node>
<node concept="1YBJjd" id="3scH5Fpc8Lr" role="2OEOjV">
<ref role="1YBMHb" node="7rG0OCdj3vr" resolve="include" />
</node>
</node>
</node>
<node concept="1Wc70l" id="3scH5Fpc71b" role="3clFbw">
<node concept="3fqX7Q" id="3scH5Fpc8vP" role="3uHU7w">
<node concept="2OqwBi" id="3scH5Fpc8vR" role="3fr31v">
<node concept="2OqwBi" id="3scH5Fpc8vS" role="2Oq$k0">
<node concept="1YBJjd" id="3scH5Fpc8vT" role="2Oq$k0">
<ref role="1YBMHb" node="7rG0OCdj3vr" resolve="include" />
</node>
<node concept="3TrEf2" id="3scH5Fpc8vU" role="2OqNvi">
<ref role="3Tt5mk" to="1btx:7rG0OCdj5GO" />
</node>
</node>
<node concept="1mIQ4w" id="3scH5Fpc8vV" role="2OqNvi">
<node concept="chp4Y" id="3scH5Fpc8vW" role="cj9EA">
<ref role="cht4Q" to="1btx:6MSPLZmFnKF" resolve="DelegateForm" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="3scH5Fpc53Q" role="3uHU7B">
<node concept="1YBJjd" id="3scH5Fpc4Zh" role="2Oq$k0">
<ref role="1YBMHb" node="7rG0OCdj3vr" resolve="include" />
</node>
<node concept="2qgKlT" id="3scH5Fpc6X5" role="2OqNvi">
<ref role="37wK5l" to="5y3p:pQ21WN5qNU" resolve="isEditingDisabled" />
</node>
</node>
</node>
</node>
</node>
Expand Down
54 changes: 38 additions & 16 deletions ...ges/org.modellwerkstatt.dataux/runtime/models/org/modellwerkstatt/dataux/runtime/core.mps
View file
Expand Up @@ -14303,7 +14303,21 @@
</node>
<node concept="3Tmbuc" id="zBgVaD9$HI" role="1B3o_S" />
<node concept="3clFbS" id="2DwOiMAqSSE" role="3clF47">
<node concept="3clFbH" id="2JDNIBMQM2R" role="3cqZAp" />
<node concept="3cpWs8" id="7P$5TTgBDZa" role="3cqZAp">
<node concept="3cpWsn" id="7P$5TTgBDZd" role="3cpWs9">
<property role="TrG5h" value="wasDynamicUpdateConclusion" />
<node concept="10P_77" id="7P$5TTgBDZ8" role="1tU5fm" />
<node concept="3clFbC" id="7P$5TTgBIgi" role="33vP2m">
<node concept="37vLTw" id="7P$5TTgBIsr" role="3uHU7w">
<ref role="3cqZAo" node="7P$uL5PnIhr" resolve="UPDATE_CONCLUSION_CODE" />
</node>
<node concept="37vLTw" id="7P$5TTgBIbd" role="3uHU7B">
<ref role="3cqZAo" node="2DwOiMArh9K" resolve="ccHash" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="7P$5TTgBIBB" role="3cqZAp" />
<node concept="3clFbJ" id="2JDNIBMQWoa" role="3cqZAp">
<node concept="3clFbS" id="2JDNIBMQWoc" role="3clFbx">
<node concept="3clFbF" id="2JDNIBMR3$Z" role="3cqZAp">
Expand Down Expand Up @@ -15201,25 +15215,32 @@
</node>
</node>
</node>
<node concept="1Wc70l" id="5s2wACm3uOd" role="3clFbw">
<node concept="2OqwBi" id="5s2wACm3Bbs" role="3uHU7w">
<node concept="37vLTw" id="5s2wACm3B97" role="2Oq$k0">
<ref role="3cqZAo" node="5YG5DD8PGOD" resolve="uiFactory" />
</node>
<node concept="liA8E" id="5s2wACm3Bun" role="2OqNvi">
<ref role="37wK5l" to="250q:kWPevMcyfQ" resolve="useBackgroundThread" />
<node concept="1Wc70l" id="7P$5TTgBMGC" role="3clFbw">
<node concept="3fqX7Q" id="7P$5TTgBUBW" role="3uHU7w">
<node concept="37vLTw" id="7P$5TTgC5Fm" role="3fr31v">
<ref role="3cqZAo" node="7P$5TTgBDZd" resolve="wasDynamicUpdateConclusion" />
</node>
</node>
<node concept="2OqwBi" id="66CXFVBdOtJ" role="3uHU7B">
<node concept="liA8E" id="66CXFVBdOtK" role="2OqNvi">
<ref role="37wK5l" to="28jr:66CXFVAgYBy" resolve="isCommandType" />
<node concept="Rm8GO" id="66CXFVBdOtL" role="37wK5m">
<ref role="1Px2BO" to="28jr:66CXFVAgWqY" resolve="IOFXCommand.OFXCmdTyp" />
<ref role="Rm8GQ" to="28jr:66CXFVAgYe9" resolve="SEARCH_CMD" />
<node concept="1Wc70l" id="5s2wACm3uOd" role="3uHU7B">
<node concept="2OqwBi" id="66CXFVBdOtJ" role="3uHU7B">
<node concept="liA8E" id="66CXFVBdOtK" role="2OqNvi">
<ref role="37wK5l" to="28jr:66CXFVAgYBy" resolve="isCommandType" />
<node concept="Rm8GO" id="66CXFVBdOtL" role="37wK5m">
<ref role="1Px2BO" to="28jr:66CXFVAgWqY" resolve="IOFXCommand.OFXCmdTyp" />
<ref role="Rm8GQ" to="28jr:66CXFVAgYe9" resolve="SEARCH_CMD" />
</node>
</node>
<node concept="37vLTw" id="66CXFVBdOtM" role="2Oq$k0">
<ref role="3cqZAo" node="7aUgYCzl1hk" resolve="command" />
</node>
</node>
<node concept="37vLTw" id="66CXFVBdOtM" role="2Oq$k0">
<ref role="3cqZAo" node="7aUgYCzl1hk" resolve="command" />
<node concept="2OqwBi" id="5s2wACm3Bbs" role="3uHU7w">
<node concept="37vLTw" id="5s2wACm3B97" role="2Oq$k0">
<ref role="3cqZAo" node="5YG5DD8PGOD" resolve="uiFactory" />
</node>
<node concept="liA8E" id="5s2wACm3Bun" role="2OqNvi">
<ref role="37wK5l" to="250q:kWPevMcyfQ" resolve="useBackgroundThread" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -25226,6 +25247,7 @@
</node>
</node>
</node>
<node concept="3clFbH" id="3lwxMAU100O" role="3cqZAp" />
<node concept="3clFbF" id="3JhXVvQ8xXh" role="3cqZAp">
<node concept="37vLTI" id="3JhXVvQ8yCe" role="3clFbG">
<node concept="37vLTw" id="3JhXVvQ8yFq" role="37vLTx">
Expand Down
2 changes: 1 addition & 1 deletion ...ow/solutions/org.modellwerkstatt.moware/models/org/modellwerkstatt/moware/PluginBuild.mps
View file
Expand Up @@ -150,7 +150,7 @@
</node>
<node concept="3_J27D" id="1JLTjCmZp29" role="m$_w8">
<node concept="3Mxwew" id="1JLTjCmZp2n" role="3MwsjC">
<property role="3MwjfP" value="MPS 3.3.5 / mowareCMD RC44 (session)" />
<property role="3MwjfP" value="MPS 3.3.5 / mowareCMD RC45 (bugs)" />
</node>
</node>
<node concept="3_J27D" id="1JLTjCmZp2j" role="3s6cr7">
Expand Down
53 changes: 39 additions & 14 deletions ...ms/solutions/org.modellwerkstatt.fx8forms/models/org/modellwerkstatt/fx8forms/windows.mps
View file
Expand Up @@ -8414,7 +8414,15 @@
<ref role="3uigEE" to="1e0c:1U$SEukxJB4" resolve="FocusController" />
</node>
</node>
<node concept="2tJIrI" id="1U$SEulohrh" role="jymVt" />
<node concept="312cEg" id="3scH5Fpm4ZE" role="jymVt">
<property role="TrG5h" value="adjustedDividerCnt" />
<node concept="3Tm6S6" id="3scH5Fpm4ZF" role="1B3o_S" />
<node concept="10Oyi0" id="3scH5Fpm7Lv" role="1tU5fm" />
<node concept="3cmrfG" id="3scH5Fpm8TC" role="33vP2m">
<property role="3cmrfH" value="0" />
</node>
</node>
<node concept="2tJIrI" id="3scH5Fpm36h" role="jymVt" />
<node concept="2tJIrI" id="1U$SEulon3g" role="jymVt" />
<node concept="3clFbW" id="6hacA6tQU0x" role="jymVt">
<node concept="3cqZAl" id="6hacA6tQU0y" role="3clF45" />
Expand Down Expand Up @@ -10058,6 +10066,13 @@
<node concept="3clFbS" id="5p1CQfO2lpS" role="3clF47">
<node concept="3clFbJ" id="5n$BU0wXmhg" role="3cqZAp">
<node concept="3clFbS" id="5n$BU0wXmhh" role="3clFbx">
<node concept="3clFbF" id="3scH5Fpm9Vm" role="3cqZAp">
<node concept="3uNrnE" id="3scH5FpmaBC" role="3clFbG">
<node concept="37vLTw" id="3scH5FpmaBE" role="2$L3a6">
<ref role="3cqZAo" node="3scH5Fpm4ZE" resolve="adjustedDividerCnt" />
</node>
</node>
</node>
<node concept="1Dw8fO" id="2rL8TAu6bd$" role="3cqZAp">
<node concept="3clFbS" id="2rL8TAu6bd_" role="2LFqv$">
<node concept="3clFbF" id="2rL8TAu6bdA" role="3cqZAp">
Expand Down Expand Up @@ -10133,23 +10148,33 @@
</node>
</node>
</node>
<node concept="3clFbC" id="5n$BU0wXmhn" role="3clFbw">
<node concept="1eOMI4" id="5p1CQfNWnKa" role="3uHU7w">
<node concept="3cpWsd" id="5p1CQfNWnKb" role="1eOMHV">
<node concept="3cmrfG" id="5p1CQfNWnKc" role="3uHU7w">
<property role="3cmrfH" value="1" />
</node>
<node concept="2OqwBi" id="5p1CQfNWnKd" role="3uHU7B">
<node concept="37vLTw" id="5p1CQfNWnKe" role="2Oq$k0">
<ref role="3cqZAo" node="5n$BU0wW0FW" resolve="dividerPositions" />
<node concept="1Wc70l" id="3scH5Fpmb4y" role="3clFbw">
<node concept="3eOVzh" id="3scH5FpmcGQ" role="3uHU7w">
<node concept="3cmrfG" id="3scH5FpmcVQ" role="3uHU7w">
<property role="3cmrfH" value="2" />
</node>
<node concept="37vLTw" id="3scH5FpmbX7" role="3uHU7B">
<ref role="3cqZAo" node="3scH5Fpm4ZE" resolve="adjustedDividerCnt" />
</node>
</node>
<node concept="3clFbC" id="5n$BU0wXmhn" role="3uHU7B">
<node concept="37vLTw" id="fdGRoMYQ38" role="3uHU7B">
<ref role="3cqZAo" node="yJ4zx49j_h" resolve="curRow" />
</node>
<node concept="1eOMI4" id="5p1CQfNWnKa" role="3uHU7w">
<node concept="3cpWsd" id="5p1CQfNWnKb" role="1eOMHV">
<node concept="3cmrfG" id="5p1CQfNWnKc" role="3uHU7w">
<property role="3cmrfH" value="1" />
</node>
<node concept="2OqwBi" id="5p1CQfNWnKd" role="3uHU7B">
<node concept="37vLTw" id="5p1CQfNWnKe" role="2Oq$k0">
<ref role="3cqZAo" node="5n$BU0wW0FW" resolve="dividerPositions" />
</node>
<node concept="34oBXx" id="5p1CQfNWnKf" role="2OqNvi" />
</node>
<node concept="34oBXx" id="5p1CQfNWnKf" role="2OqNvi" />
</node>
</node>
</node>
<node concept="37vLTw" id="fdGRoMYQ38" role="3uHU7B">
<ref role="3cqZAo" node="yJ4zx49j_h" resolve="curRow" />
</node>
</node>
</node>
<node concept="3clFbH" id="20ZvV_ntvLw" role="3cqZAp" />
Expand Down

0 comments on commit b9aa48c

Please sign in to comment.