Skip to content

Commit

Permalink
mpsutil: Added actions for Editor text zoom; added getConcept() to Pa…
Browse files Browse the repository at this point in the history
…tternType; icon, dependency, and build model cleanup.

The solution com.mbeddr.mpsutil.genericactions (bad name, couldn't think of a better one) contains actions for Increase/Decrease/Reset MPS Editor font size. You may want to bind them to Ctrl++ / Ctrl+- / Ctrl+0.

The language com.mbeddr.mpsutil.pattern now provides a getConcept() method for the PatternType, so we may query the concept of the used pattern.

Cleaned up dependencies of com.mbeddr.mpsutil.lantest and similar, especially removing the circular self-dependency leading to annoying messages on the console all the time.

Fixed the warning in com.mbeddr.platform build model.
Restructured this build model into several MPS groups, similar to the virtual folders in the corresponding project.

Fixed lots of icon sizes and transparency issues in com.mbeddr.doc.*, com.mbeddr.core.base, and com.mbeddr.analyses.cbmc.* to avoid graphical glitches and annoying messages on the console all the time.
  • Loading branch information
Niko Stotz committed Jan 24, 2016
1 parent b0ea042 commit 23dc17c
Show file tree
Hide file tree
Showing 33 changed files with 5,743 additions and 4,750 deletions.
3 changes: 2 additions & 1 deletion build/com.mbeddr.allScripts/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<property name="mps.teamcity.buildConfName" value="${import.mps.mps.teamcity.buildConfName}" />
<property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
<property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
<property name="env.JAVA_HOME" value="${java.home}/.." />
<property name="jdk.home" value="${env.JAVA_HOME}" />

<path id="path.mps.ant.path">
<pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
Expand Down Expand Up @@ -486,7 +488,6 @@
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.customAspect.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2723,7 +2723,7 @@
</node>
</node>
<node concept="1QGGSu" id="3Ymokd9HTEP" role="1nVCmq">
<property role="1QGGTI" value="${solution_descriptor}/icons/verify.png" />
<property role="1QGGTI" value="${module}/icons/verify.png" />
</node>
</node>
<node concept="312cEu" id="3Ymokd9EUau">
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -1512,6 +1512,21 @@
</node>
</node>
</node>
<node concept="3clFbJ" id="6riHK2FnP8z" role="3cqZAp">
<node concept="3clFbS" id="6riHK2FnP8_" role="3clFbx">
<node concept="3cpWs6" id="6riHK2FnPqa" role="3cqZAp">
<node concept="3clFbT" id="6riHK2FnPuH" role="3cqZAk">
<property role="3clFbU" value="false" />
</node>
</node>
</node>
<node concept="3clFbC" id="6riHK2FnPhM" role="3clFbw">
<node concept="10Nm6u" id="6riHK2FnPlI" role="3uHU7w" />
<node concept="37vLTw" id="6riHK2FnPdv" role="3uHU7B">
<ref role="3cqZAo" node="2sSBlKpTdgf" resolve="c" />
</node>
</node>
</node>
<node concept="3cpWs8" id="2sSBlKpTdYq" role="3cqZAp">
<node concept="3cpWsn" id="2sSBlKpTdYr" role="3cpWs9">
<property role="TrG5h" value="messages" />
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
<language id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" fqName="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
<language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
<language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
<language id="f159adf4-3c93-40f9-9c5a-1f245a8697af" fqName="jetbrains.mps.lang.aspect" version="0" />
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" fqName="jetbrains.mps.lang.behavior" version="0" />
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<languages>
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="2" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<persistence version="9" />
<languages>
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
<use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.customAspect" version="0" />
<use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="0" />
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
Expand All @@ -15,13 +15,13 @@
<property id="8974276187400029899" name="path" index="1QGGTI" />
</concept>
</language>
<language id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.customAspect">
<concept id="3433054418424672374" name="jetbrains.mps.lang.customAspect.structure.SimpleLanguageAspectDescriptor" flags="ng" index="3vrhyV">
<language id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect">
<concept id="3433054418424672374" name="jetbrains.mps.lang.aspect.structure.SimpleLanguageAspectDescriptor" flags="ng" index="3vrhyV">
<child id="3433054418425083029" name="icon" index="3vqPLo" />
<child id="3433054418424672404" name="mainLanguage" index="3vrhxp" />
<child id="3433054418424672404" name="mainLanguages" index="3vrhxp" />
<child id="3433054418424672406" name="additionalLanguages" index="3vrhxr" />
</concept>
<concept id="3433054418424678522" name="jetbrains.mps.lang.customAspect.structure.LanguageReference" flags="ng" index="3vrm2R" />
<concept id="3433054418424678522" name="jetbrains.mps.lang.aspect.structure.LanguageReference" flags="ng" index="3vrm2R" />
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="4497478346159780083" name="jetbrains.mps.lang.smodel.structure.LanguageRefExpression" flags="ng" index="pHN19">
Expand All @@ -47,7 +47,7 @@
</node>
</node>
<node concept="1QGGSu" id="70oIz4aiOKk" role="3vqPLo">
<property role="1QGGTI" value="${module}/icons/toc_closed.gif" />
<property role="1QGGTI" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/icons/toc_closed.png" />
</node>
<node concept="3vrm2R" id="70oIz4amd6H" role="3vrhxr">
<node concept="2V$Bhx" id="70oIz4amd6T" role="2V$M_3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" fqName="jetbrains.mps.baseLanguage.collections" version="0" />
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" fqName="jetbrains.mps.baseLanguage.logging" version="0" />
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" fqName="jetbrains.mps.baseLanguage.tuples" version="0" />
<language id="63650c59-16c8-498a-99c8-005c7ee9515d" fqName="jetbrains.mps.lang.access" version="0" />
<language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" fqName="jetbrains.mps.lang.actions" version="0" />
<language id="fe9d76d7-5809-45c9-ae28-a40915b4d6ff" fqName="jetbrains.mps.lang.checkedName" version="0" />
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" fqName="jetbrains.mps.lang.core" version="1" />
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="2" />
<use id="58e731a3-6aaa-444a-bf40-801b91c15878" name="com.mbeddr.mpsutil.lang.plugin.extensions" version="0" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>
<imports>
<import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
Expand Down Expand Up @@ -509,7 +510,7 @@
</node>
</node>
<node concept="1QGGSu" id="UK_oBpzHVU" role="3Uehp1">
<property role="1QGGTI" value="${module}/icons/toc_closed.gif" />
<property role="1QGGTI" value="${module}/icons/toc_closed.png" />
</node>
</node>
<node concept="tC5Ba" id="69s3uhHThi8">
Expand Down Expand Up @@ -1832,7 +1833,7 @@
<ref role="37wK5l" to="v7ux:~Content.setIcon(javax.swing.Icon):void" resolve="setIcon" />
<node concept="1QGGTA" id="1IUlN8Q3WKA" role="37wK5m">
<node concept="1QGGSu" id="1IUlN8Q3WKB" role="1QGGTw">
<property role="1QGGTI" value="${module}/icons/toc_closed.gif" />
<property role="1QGGTI" value="${module}/icons/toc_closed.png" />
</node>
</node>
</node>
Expand Down Expand Up @@ -1888,7 +1889,7 @@
<ref role="37wK5l" to="v7ux:~Content.setIcon(javax.swing.Icon):void" resolve="setIcon" />
<node concept="1QGGTA" id="7r8qu42xWDv" role="37wK5m">
<node concept="1QGGSu" id="7r8qu42xWDw" role="1QGGTw">
<property role="1QGGTI" value="${module}/icons/toc_closed.gif" />
<property role="1QGGTI" value="${module}/icons/toc_closed.png" />
</node>
</node>
</node>
Expand Down Expand Up @@ -2507,7 +2508,7 @@
</node>
<node concept="1QGGTA" id="1IUlN8Q5qpc" role="2BLOvy">
<node concept="1QGGSu" id="1IUlN8Q5qpf" role="1QGGTw">
<property role="1QGGTI" value="${module}/icons/toc_closed.gif" />
<property role="1QGGTI" value="${module}/icons/toc_closed.png" />
</node>
</node>
</node>
Expand Down Expand Up @@ -2548,7 +2549,7 @@
</node>
<node concept="1QGGTA" id="7r8qu42xUal" role="2BLOvy">
<node concept="1QGGSu" id="7r8qu42xUam" role="1QGGTw">
<property role="1QGGTI" value="${module}/icons/toc_closed.gif" />
<property role="1QGGTI" value="${module}/icons/toc_closed.png" />
</node>
</node>
</node>
Expand All @@ -2566,7 +2567,7 @@
</node>
</node>
<node concept="1QGGSu" id="1KDc5EfI0Ce" role="1nVCmq">
<property role="1QGGTI" value="${module}/icons/toc_closed.gif" />
<property role="1QGGTI" value="${module}/icons/toc_closed.png" />
</node>
</node>
</model>
Expand Down
9 changes: 5 additions & 4 deletions code/languages/com.mbeddr.mpsutil/.mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.multilingual.concept/com.mbeddr.mpsutil.multilingual.concept.mpl" folder="multilingual" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.multilingual.editor/com.mbeddr.mpsutil.multilingual.editor.mpl" folder="multilingual" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.nodes_tracing/com.mbeddr.mpsutil.nodes_tracing.mpl" folder="lantest" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.placeholderTextList/com.mbeddr.mpsutil.placeholderTextList.mpl" folder="greyTextList" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.placeholderTextList/com.mbeddr.mpsutil.placeholderTextList.mpl" folder="placeholderTextList" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.plantuml.node/com.mbeddr.mpsutil.plantuml.node.mpl" folder="plantuml" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl" folder="preferenceform" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.process/com.mbeddr.mpsutil.process.mpl" folder="process" />
Expand Down Expand Up @@ -112,6 +112,7 @@
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.editor.querylist.sandbox/com.mbeddr.mpsutil.editor.querylist.sandbox.msd" folder="querylist" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.editor.utils/com.mbeddr.mpsutil.editor.utils.msd" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.extensionclass.annotation/com.mbeddr.mpsutil.extensionclass.annotation.msd" folder="extensionclass" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.genericactions/com.mbeddr.mpsutil.genericactions.msd" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.globalgenerators.runtime/com.mbeddr.mpsutil.globalgenerators.runtime.msd" folder="globalGenerators" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.grammarcells.runtime/com.mbeddr.mpsutil.grammarcells.runtime.msd" folder="grammarCells" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.grammarcells.sandbox/com.mbeddr.mpsutil.grammarcells.sandbox.msd" folder="grammarCells" />
Expand All @@ -135,7 +136,7 @@
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.nodeaccess/com.mbeddr.mpsutil.nodeaccess.msd" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.nodediff/com.mbeddr.mpsutil.nodediff.msd" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.nodes_tracing.pluginSolution/com.mbeddr.mpsutil.nodes_tracing.pluginSolution.msd" folder="lantest" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.placeholderTextList.runtime/com.mbeddr.mpsutil.placeholderTextList.runtime.msd" folder="greyTextList" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.placeholderTextList.runtime/com.mbeddr.mpsutil.placeholderTextList.runtime.msd" folder="placeholderTextList" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/pluginSolution.msd" folder="plantuml" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.preferenceform.runtime/com.mbeddr.mpsutil.preferenceform.runtime.msd" folder="preferenceform" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.print.pluginSolution/com.mbeddr.mpsutil.print.pluginSolution.msd" folder="" />
Expand Down Expand Up @@ -164,8 +165,8 @@
<modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.extensionclass/test.com.mbeddr.mpsutil.extensionclass.msd" folder="extensionclass" />
<modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.iconchar.test/test.com.mbeddr.mpsutil.iconchar.test.msd" folder="iconchar" />
<modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.iconchar/test.com.mbeddr.mpsutil.iconchar.mpl" folder="iconchar" />
<modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.placeholderTextList.testlang/test.com.mbeddr.mpsutil.placeholderTextList.testlang.mpl" folder="greyTextList" />
<modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.placeholderTextList/test.com.mbeddr.mpsutil.placeholderTextList.msd" folder="greyTextList" />
<modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.placeholderTextList.testlang/test.com.mbeddr.mpsutil.placeholderTextList.testlang.mpl" folder="placeholderTextList" />
<modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.placeholderTextList/test.com.mbeddr.mpsutil.placeholderTextList.msd" folder="placeholderTextList" />
<modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.targetchooser/test.com.mbeddr.mpsutil.targetchooser.msd" folder="targetchooser" />
<modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.testScope.negative/test.com.mbeddr.mpsutil.testScope.negative.msd" folder="testScope" />
<modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.testScope/test.com.mbeddr.mpsutil.testScope.msd" folder="testScope" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<child id="1068431790190" name="initializer" index="33vP2m" />
</concept>
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
</concept>
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
Expand Down Expand Up @@ -1097,6 +1100,71 @@
</node>
</node>
</node>
<node concept="3aamgX" id="3quoVcnVKb1" role="3acgRq">
<ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
<node concept="30G5F_" id="3quoVcnVMl_" role="30HLyM">
<node concept="3clFbS" id="3quoVcnVMlA" role="2VODD2">
<node concept="3clFbF" id="3quoVcnVMmI" role="3cqZAp">
<node concept="2OqwBi" id="3quoVcnUZjD" role="3clFbG">
<node concept="2OqwBi" id="3quoVcnUZjE" role="2Oq$k0">
<node concept="30H73N" id="3quoVcnUZjF" role="2Oq$k0" />
<node concept="3TrEf2" id="3quoVcnUZjG" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hqOqNr4" />
</node>
</node>
<node concept="1mIQ4w" id="3quoVcnUZjH" role="2OqNvi">
<node concept="chp4Y" id="3quoVcnVMql" role="cj9EA">
<ref role="cht4Q" to="iqxq:3quoVcnVIhX" resolve="GetConceptOperation" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1Koe21" id="3quoVcnUZiU" role="1lVwrX">
<node concept="3clFb_" id="3quoVcnUZiV" role="1Koe22">
<property role="TrG5h" value="genMethod" />
<node concept="3cqZAl" id="3quoVcnUZiW" role="3clF45" />
<node concept="3Tm1VV" id="3quoVcnUZiX" role="1B3o_S" />
<node concept="3clFbS" id="3quoVcnUZiY" role="3clF47">
<node concept="3cpWs8" id="3quoVcnUZiZ" role="3cqZAp">
<node concept="3cpWsn" id="3quoVcnUZj0" role="3cpWs9">
<property role="TrG5h" value="node" />
<node concept="3uibUv" id="3quoVcnVMI2" role="1tU5fm">
<ref role="3uigEE" to="xpog:53_zXRTtL9" resolve="PatternBuilderNode" />
</node>
<node concept="10Nm6u" id="3quoVcnUZj2" role="33vP2m" />
</node>
</node>
<node concept="3clFbF" id="3quoVcnUZj3" role="3cqZAp">
<node concept="2OqwBi" id="3quoVcnUZj4" role="3clFbG">
<node concept="37vLTw" id="3quoVcnUZj5" role="2Oq$k0">
<ref role="3cqZAo" node="3quoVcnUZj0" resolve="node" />
<node concept="29HgVG" id="3quoVcnUZj6" role="lGtFl">
<node concept="3NFfHV" id="3quoVcnUZj7" role="3NFExx">
<node concept="3clFbS" id="3quoVcnUZj8" role="2VODD2">
<node concept="3clFbF" id="3quoVcnUZj9" role="3cqZAp">
<node concept="2OqwBi" id="3quoVcnUZja" role="3clFbG">
<node concept="3TrEf2" id="3quoVcnUZjb" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hqOq$gm" />
</node>
<node concept="30H73N" id="3quoVcnUZjc" role="2Oq$k0" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="liA8E" id="3quoVcnVS$2" role="2OqNvi">
<ref role="37wK5l" to="xpog:3quoVcnVPDS" resolve="getConcept" />
</node>
<node concept="raruj" id="3quoVcnUZjr" role="lGtFl" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</model>

Loading

0 comments on commit 23dc17c

Please sign in to comment.