Skip to content

Commit

Permalink
Merge pull request #622 from IETS3/bugfix/open_dialogs_on_edt_thread
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann committed Dec 22, 2022
2 parents 58d4fb0 + a18492f commit f716dd8
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 54 deletions.
47 changes: 31 additions & 16 deletions code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps
View file
Expand Up @@ -6905,23 +6905,38 @@
</node>
<node concept="9aQIb" id="2E$J0GoiiFu" role="9aQIa">
<node concept="3clFbS" id="2E$J0GoiiFv" role="9aQI4">
<node concept="3clFbF" id="2E$J0God1JX" role="3cqZAp">
<node concept="2YIFZM" id="2E$J0GoiwsG" role="3clFbG">
<ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(com.intellij.openapi.project.Project,java.lang.String,java.lang.String)" resolve="showWarningDialog" />
<ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
<node concept="2OqwBi" id="2E$J0GoiyoZ" role="37wK5m">
<node concept="37vLTw" id="2E$J0GoiwsH" role="2Oq$k0">
<ref role="3cqZAo" node="2E$J0GohUwH" resolve="mpsProject" />
</node>
<node concept="liA8E" id="2E$J0GoiziV" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
</node>
</node>
<node concept="Xl_RD" id="2E$J0GoiwsI" role="37wK5m">
<property role="Xl_RC" value="Solvable node is not available anymore" />
<node concept="3clFbF" id="Mi7DpTpfAU" role="3cqZAp">
<node concept="2OqwBi" id="Mi7DpTpnEU" role="3clFbG">
<node concept="2YIFZM" id="Mi7DpTpl5E" role="2Oq$k0">
<ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
<ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
</node>
<node concept="Xl_RD" id="2E$J0GoiJ1b" role="37wK5m">
<property role="Xl_RC" value="Solvable not found" />
<node concept="liA8E" id="Mi7DpTptA6" role="2OqNvi">
<ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
<node concept="1bVj0M" id="Mi7DpTpzlR" role="37wK5m">
<node concept="3clFbS" id="Mi7DpTpzlS" role="1bW5cS">
<node concept="3clFbF" id="Mi7DpTpGMU" role="3cqZAp">
<node concept="2YIFZM" id="2E$J0GoiwsG" role="3clFbG">
<ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(com.intellij.openapi.project.Project,java.lang.String,java.lang.String)" resolve="showWarningDialog" />
<ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
<node concept="2OqwBi" id="2E$J0GoiyoZ" role="37wK5m">
<node concept="37vLTw" id="2E$J0GoiwsH" role="2Oq$k0">
<ref role="3cqZAo" node="2E$J0GohUwH" resolve="mpsProject" />
</node>
<node concept="liA8E" id="2E$J0GoiziV" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
</node>
</node>
<node concept="Xl_RD" id="2E$J0GoiwsI" role="37wK5m">
<property role="Xl_RC" value="Solvable node is not available anymore" />
</node>
<node concept="Xl_RD" id="2E$J0GoiJ1b" role="37wK5m">
<property role="Xl_RC" value="Solvable not found" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
Expand Down
52 changes: 34 additions & 18 deletions code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps
View file
Expand Up @@ -50,6 +50,7 @@
<import index="ir4w" ref="r:1ee7d695-67a0-4310-b6a9-28ed5f54bc88(org.iets3.core.attributes.editor)" />
<import index="zf81" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.net(JDK/)" />
<import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
<import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
<import index="itrz" ref="r:80fb0853-eb3b-4e84-aebd-cc7fdb011d97(org.iets3.core.base.editor)" implicit="true" />
Expand Down Expand Up @@ -4623,25 +4624,40 @@
</node>
</node>
</node>
<node concept="3clFbF" id="41i_FWyXP1_" role="3cqZAp">
<node concept="2YIFZM" id="41i_FWyXP1A" role="3clFbG">
<ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
<ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
<node concept="10Nm6u" id="41i_FWyXP1B" role="37wK5m" />
<node concept="3cpWs3" id="41i_FWyXP1C" role="37wK5m">
<node concept="37vLTw" id="41i_FWyXP1D" role="3uHU7w">
<ref role="3cqZAo" node="41i_FWyXP19" resolve="nestedPath" />
</node>
<node concept="Xl_RD" id="41i_FWyXP1E" role="3uHU7B">
<property role="Xl_RC" value="Attempted to create recursive nesting of components:\n" />
</node>
</node>
<node concept="Xl_RD" id="41i_FWyXP1F" role="37wK5m">
<property role="Xl_RC" value="Illegal nesting" />
<node concept="3clFbF" id="Mi7DpTqoT_" role="3cqZAp">
<node concept="2OqwBi" id="Mi7DpTqrm6" role="3clFbG">
<node concept="2YIFZM" id="Mi7DpTqqqY" role="2Oq$k0">
<ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
<ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
</node>
<node concept="10M0yZ" id="41i_FWyXP1G" role="37wK5m">
<ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
<ref role="3cqZAo" to="dxuu:~JOptionPane.WARNING_MESSAGE" resolve="WARNING_MESSAGE" />
<node concept="liA8E" id="Mi7DpTqwzM" role="2OqNvi">
<ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
<node concept="1bVj0M" id="Mi7DpTqxTn" role="37wK5m">
<node concept="3clFbS" id="Mi7DpTqxTo" role="1bW5cS">
<node concept="3clFbF" id="Mi7DpTq$F7" role="3cqZAp">
<node concept="2YIFZM" id="41i_FWyXP1A" role="3clFbG">
<ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
<ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
<node concept="10Nm6u" id="41i_FWyXP1B" role="37wK5m" />
<node concept="3cpWs3" id="41i_FWyXP1C" role="37wK5m">
<node concept="37vLTw" id="41i_FWyXP1D" role="3uHU7w">
<ref role="3cqZAo" node="41i_FWyXP19" resolve="nestedPath" />
</node>
<node concept="Xl_RD" id="41i_FWyXP1E" role="3uHU7B">
<property role="Xl_RC" value="Attempted to create recursive nesting of components:\n" />
</node>
</node>
<node concept="Xl_RD" id="41i_FWyXP1F" role="37wK5m">
<property role="Xl_RC" value="Illegal nesting" />
</node>
<node concept="10M0yZ" id="41i_FWyXP1G" role="37wK5m">
<ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
<ref role="3cqZAo" to="dxuu:~JOptionPane.WARNING_MESSAGE" resolve="WARNING_MESSAGE" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
Expand Down
56 changes: 36 additions & 20 deletions code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps
View file
Expand Up @@ -69,6 +69,7 @@
<import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
<import index="jmi8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.util(MPS.IDEA/)" />
<import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
<import index="3673" ref="r:78633c85-d020-485e-aaa3-59e2daa3b826(com.mbeddr.mpsutil.interpreter.structure)" implicit="true" />
<import index="kqnq" ref="r:7628c3bd-6988-4d33-9682-86b8cef4b8c0(com.mbeddr.mpsutil.interpreter.behavior)" implicit="true" />
Expand Down Expand Up @@ -1143,38 +1144,53 @@
<node concept="3clFbS" id="2g6f$baql9u" role="3clF47">
<node concept="3clFbJ" id="2g6f$bar0kg" role="3cqZAp">
<node concept="3clFbS" id="2g6f$bar0ki" role="3clFbx">
<node concept="3clFbF" id="2g6f$bb2Ad9" role="3cqZAp">
<node concept="2YIFZM" id="2g6f$bb2Aeh" role="3clFbG">
<ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
<ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
<node concept="3cpWs3" id="2g6f$bb2ABa" role="37wK5m">
<node concept="2OqwBi" id="1br4Vy9o_n" role="3uHU7w">
<node concept="2OqwBi" id="1br4Vy9o_o" role="2Oq$k0">
<node concept="2WthIp" id="1br4Vy9o_p" role="2Oq$k0" />
<node concept="3gHZIF" id="1br4Vy9o_q" role="2OqNvi">
<ref role="2WH_rO" node="5ipapt3lxen" resolve="someNode" />
<node concept="3clFbF" id="Mi7DpTpS7i" role="3cqZAp">
<node concept="2OqwBi" id="Mi7DpTpVMx" role="3clFbG">
<node concept="2YIFZM" id="Mi7DpTpUul" role="2Oq$k0">
<ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
<ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
</node>
<node concept="liA8E" id="Mi7DpTpYCz" role="2OqNvi">
<ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
<node concept="1bVj0M" id="Mi7DpTq10i" role="37wK5m">
<node concept="3clFbS" id="Mi7DpTq10j" role="1bW5cS">
<node concept="3clFbF" id="2g6f$bb2Ad9" role="3cqZAp">
<node concept="2YIFZM" id="2g6f$bb2Aeh" role="3clFbG">
<ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
<ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
<node concept="3cpWs3" id="2g6f$bb2ABa" role="37wK5m">
<node concept="2OqwBi" id="1br4Vy9o_n" role="3uHU7w">
<node concept="2OqwBi" id="1br4Vy9o_o" role="2Oq$k0">
<node concept="2WthIp" id="1br4Vy9o_p" role="2Oq$k0" />
<node concept="3gHZIF" id="1br4Vy9o_q" role="2OqNvi">
<ref role="2WH_rO" node="5ipapt3lxen" resolve="someNode" />
</node>
</node>
<node concept="2qgKlT" id="1br4Vy9o_r" role="2OqNvi">
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
</node>
</node>
<node concept="Xl_RD" id="2g6f$bb2AfU" role="3uHU7B">
<property role="Xl_RC" value="The trace was null for node \n" />
</node>
</node>
<node concept="Xl_RD" id="2g6f$bb2AeO" role="37wK5m">
<property role="Xl_RC" value="Tracing" />
</node>
</node>
</node>
</node>
<node concept="2qgKlT" id="1br4Vy9o_r" role="2OqNvi">
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
</node>
</node>
<node concept="Xl_RD" id="2g6f$bb2AfU" role="3uHU7B">
<property role="Xl_RC" value="The trace was null for node \n" />
</node>
</node>
<node concept="Xl_RD" id="2g6f$bb2AeO" role="37wK5m">
<property role="Xl_RC" value="Tracing" />
</node>
</node>
</node>
<node concept="3cpWs6" id="2g6f$bar1TO" role="3cqZAp" />
</node>
<node concept="3clFbC" id="2g6f$bar1p$" role="3clFbw">
<node concept="10Nm6u" id="2g6f$bar1Qb" role="3uHU7w" />
<node concept="37vLTw" id="2g6f$bar0T4" role="3uHU7B">
<ref role="3cqZAo" node="2g6f$baqub7" resolve="root" />
</node>
<node concept="10Nm6u" id="2g6f$bar1Qb" role="3uHU7w" />
</node>
</node>
<node concept="3cpWs8" id="5Ch7I6mj5T1" role="3cqZAp">
Expand Down

0 comments on commit f716dd8

Please sign in to comment.