Skip to content

Commit f716dd8

Browse files
alexanderpannalexanderpann
authored
Merge pull request #622 from IETS3/bugfix/open_dialogs_on_edt_thread
2 parents 58d4fb0 + a18492f commit f716dd8

File tree

3 files changed

+101
-54
lines changed
  • code/languages/org.iets3.opensource

3 files changed

+101
-54
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6905,23 +6905,38 @@
69056905
</node>
69066906
<node concept="9aQIb" id="2E$J0GoiiFu" role="9aQIa">
69076907
<node concept="3clFbS" id="2E$J0GoiiFv" role="9aQI4">
6908-
<node concept="3clFbF" id="2E$J0God1JX" role="3cqZAp">
6909-
<node concept="2YIFZM" id="2E$J0GoiwsG" role="3clFbG">
6910-
<ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(com.intellij.openapi.project.Project,java.lang.String,java.lang.String)" resolve="showWarningDialog" />
6911-
<ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
6912-
<node concept="2OqwBi" id="2E$J0GoiyoZ" role="37wK5m">
6913-
<node concept="37vLTw" id="2E$J0GoiwsH" role="2Oq$k0">
6914-
<ref role="3cqZAo" node="2E$J0GohUwH" resolve="mpsProject" />
6915-
</node>
6916-
<node concept="liA8E" id="2E$J0GoiziV" role="2OqNvi">
6917-
<ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
6918-
</node>
6919-
</node>
6920-
<node concept="Xl_RD" id="2E$J0GoiwsI" role="37wK5m">
6921-
<property role="Xl_RC" value="Solvable node is not available anymore" />
6908+
<node concept="3clFbF" id="Mi7DpTpfAU" role="3cqZAp">
6909+
<node concept="2OqwBi" id="Mi7DpTpnEU" role="3clFbG">
6910+
<node concept="2YIFZM" id="Mi7DpTpl5E" role="2Oq$k0">
6911+
<ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
6912+
<ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
69226913
</node>
6923-
<node concept="Xl_RD" id="2E$J0GoiJ1b" role="37wK5m">
6924-
<property role="Xl_RC" value="Solvable not found" />
6914+
<node concept="liA8E" id="Mi7DpTptA6" role="2OqNvi">
6915+
<ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
6916+
<node concept="1bVj0M" id="Mi7DpTpzlR" role="37wK5m">
6917+
<node concept="3clFbS" id="Mi7DpTpzlS" role="1bW5cS">
6918+
<node concept="3clFbF" id="Mi7DpTpGMU" role="3cqZAp">
6919+
<node concept="2YIFZM" id="2E$J0GoiwsG" role="3clFbG">
6920+
<ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(com.intellij.openapi.project.Project,java.lang.String,java.lang.String)" resolve="showWarningDialog" />
6921+
<ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
6922+
<node concept="2OqwBi" id="2E$J0GoiyoZ" role="37wK5m">
6923+
<node concept="37vLTw" id="2E$J0GoiwsH" role="2Oq$k0">
6924+
<ref role="3cqZAo" node="2E$J0GohUwH" resolve="mpsProject" />
6925+
</node>
6926+
<node concept="liA8E" id="2E$J0GoiziV" role="2OqNvi">
6927+
<ref role="37wK5l" to="z1c3:~MPSProject.getProject()" resolve="getProject" />
6928+
</node>
6929+
</node>
6930+
<node concept="Xl_RD" id="2E$J0GoiwsI" role="37wK5m">
6931+
<property role="Xl_RC" value="Solvable node is not available anymore" />
6932+
</node>
6933+
<node concept="Xl_RD" id="2E$J0GoiJ1b" role="37wK5m">
6934+
<property role="Xl_RC" value="Solvable not found" />
6935+
</node>
6936+
</node>
6937+
</node>
6938+
</node>
6939+
</node>
69256940
</node>
69266941
</node>
69276942
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<import index="ir4w" ref="r:1ee7d695-67a0-4310-b6a9-28ed5f54bc88(org.iets3.core.attributes.editor)" />
5151
<import index="zf81" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.net(JDK/)" />
5252
<import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
53+
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
5354
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
5455
<import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
5556
<import index="itrz" ref="r:80fb0853-eb3b-4e84-aebd-cc7fdb011d97(org.iets3.core.base.editor)" implicit="true" />
@@ -4623,25 +4624,40 @@
46234624
</node>
46244625
</node>
46254626
</node>
4626-
<node concept="3clFbF" id="41i_FWyXP1_" role="3cqZAp">
4627-
<node concept="2YIFZM" id="41i_FWyXP1A" role="3clFbG">
4628-
<ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
4629-
<ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
4630-
<node concept="10Nm6u" id="41i_FWyXP1B" role="37wK5m" />
4631-
<node concept="3cpWs3" id="41i_FWyXP1C" role="37wK5m">
4632-
<node concept="37vLTw" id="41i_FWyXP1D" role="3uHU7w">
4633-
<ref role="3cqZAo" node="41i_FWyXP19" resolve="nestedPath" />
4634-
</node>
4635-
<node concept="Xl_RD" id="41i_FWyXP1E" role="3uHU7B">
4636-
<property role="Xl_RC" value="Attempted to create recursive nesting of components:\n" />
4637-
</node>
4638-
</node>
4639-
<node concept="Xl_RD" id="41i_FWyXP1F" role="37wK5m">
4640-
<property role="Xl_RC" value="Illegal nesting" />
4627+
<node concept="3clFbF" id="Mi7DpTqoT_" role="3cqZAp">
4628+
<node concept="2OqwBi" id="Mi7DpTqrm6" role="3clFbG">
4629+
<node concept="2YIFZM" id="Mi7DpTqqqY" role="2Oq$k0">
4630+
<ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
4631+
<ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
46414632
</node>
4642-
<node concept="10M0yZ" id="41i_FWyXP1G" role="37wK5m">
4643-
<ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
4644-
<ref role="3cqZAo" to="dxuu:~JOptionPane.WARNING_MESSAGE" resolve="WARNING_MESSAGE" />
4633+
<node concept="liA8E" id="Mi7DpTqwzM" role="2OqNvi">
4634+
<ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
4635+
<node concept="1bVj0M" id="Mi7DpTqxTn" role="37wK5m">
4636+
<node concept="3clFbS" id="Mi7DpTqxTo" role="1bW5cS">
4637+
<node concept="3clFbF" id="Mi7DpTq$F7" role="3cqZAp">
4638+
<node concept="2YIFZM" id="41i_FWyXP1A" role="3clFbG">
4639+
<ref role="37wK5l" to="dxuu:~JOptionPane.showMessageDialog(java.awt.Component,java.lang.Object,java.lang.String,int)" resolve="showMessageDialog" />
4640+
<ref role="1Pybhc" to="dxuu:~JOptionPane" resolve="JOptionPane" />
4641+
<node concept="10Nm6u" id="41i_FWyXP1B" role="37wK5m" />
4642+
<node concept="3cpWs3" id="41i_FWyXP1C" role="37wK5m">
4643+
<node concept="37vLTw" id="41i_FWyXP1D" role="3uHU7w">
4644+
<ref role="3cqZAo" node="41i_FWyXP19" resolve="nestedPath" />
4645+
</node>
4646+
<node concept="Xl_RD" id="41i_FWyXP1E" role="3uHU7B">
4647+
<property role="Xl_RC" value="Attempted to create recursive nesting of components:\n" />
4648+
</node>
4649+
</node>
4650+
<node concept="Xl_RD" id="41i_FWyXP1F" role="37wK5m">
4651+
<property role="Xl_RC" value="Illegal nesting" />
4652+
</node>
4653+
<node concept="10M0yZ" id="41i_FWyXP1G" role="37wK5m">
4654+
<ref role="1PxDUh" to="dxuu:~JOptionPane" resolve="JOptionPane" />
4655+
<ref role="3cqZAo" to="dxuu:~JOptionPane.WARNING_MESSAGE" resolve="WARNING_MESSAGE" />
4656+
</node>
4657+
</node>
4658+
</node>
4659+
</node>
4660+
</node>
46454661
</node>
46464662
</node>
46474663
</node>

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.plugin/models/plugin.mps‎

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
7070
<import index="jmi8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide.util(MPS.IDEA/)" />
7171
<import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
72+
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
7273
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
7374
<import index="3673" ref="r:78633c85-d020-485e-aaa3-59e2daa3b826(com.mbeddr.mpsutil.interpreter.structure)" implicit="true" />
7475
<import index="kqnq" ref="r:7628c3bd-6988-4d33-9682-86b8cef4b8c0(com.mbeddr.mpsutil.interpreter.behavior)" implicit="true" />
@@ -1143,38 +1144,53 @@
11431144
<node concept="3clFbS" id="2g6f$baql9u" role="3clF47">
11441145
<node concept="3clFbJ" id="2g6f$bar0kg" role="3cqZAp">
11451146
<node concept="3clFbS" id="2g6f$bar0ki" role="3clFbx">
1146-
<node concept="3clFbF" id="2g6f$bb2Ad9" role="3cqZAp">
1147-
<node concept="2YIFZM" id="2g6f$bb2Aeh" role="3clFbG">
1148-
<ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
1149-
<ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
1150-
<node concept="3cpWs3" id="2g6f$bb2ABa" role="37wK5m">
1151-
<node concept="2OqwBi" id="1br4Vy9o_n" role="3uHU7w">
1152-
<node concept="2OqwBi" id="1br4Vy9o_o" role="2Oq$k0">
1153-
<node concept="2WthIp" id="1br4Vy9o_p" role="2Oq$k0" />
1154-
<node concept="3gHZIF" id="1br4Vy9o_q" role="2OqNvi">
1155-
<ref role="2WH_rO" node="5ipapt3lxen" resolve="someNode" />
1147+
<node concept="3clFbF" id="Mi7DpTpS7i" role="3cqZAp">
1148+
<node concept="2OqwBi" id="Mi7DpTpVMx" role="3clFbG">
1149+
<node concept="2YIFZM" id="Mi7DpTpUul" role="2Oq$k0">
1150+
<ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
1151+
<ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
1152+
</node>
1153+
<node concept="liA8E" id="Mi7DpTpYCz" role="2OqNvi">
1154+
<ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
1155+
<node concept="1bVj0M" id="Mi7DpTq10i" role="37wK5m">
1156+
<node concept="3clFbS" id="Mi7DpTq10j" role="1bW5cS">
1157+
<node concept="3clFbF" id="2g6f$bb2Ad9" role="3cqZAp">
1158+
<node concept="2YIFZM" id="2g6f$bb2Aeh" role="3clFbG">
1159+
<ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
1160+
<ref role="37wK5l" to="jkm4:~Messages.showErrorDialog(java.lang.String,java.lang.String)" resolve="showErrorDialog" />
1161+
<node concept="3cpWs3" id="2g6f$bb2ABa" role="37wK5m">
1162+
<node concept="2OqwBi" id="1br4Vy9o_n" role="3uHU7w">
1163+
<node concept="2OqwBi" id="1br4Vy9o_o" role="2Oq$k0">
1164+
<node concept="2WthIp" id="1br4Vy9o_p" role="2Oq$k0" />
1165+
<node concept="3gHZIF" id="1br4Vy9o_q" role="2OqNvi">
1166+
<ref role="2WH_rO" node="5ipapt3lxen" resolve="someNode" />
1167+
</node>
1168+
</node>
1169+
<node concept="2qgKlT" id="1br4Vy9o_r" role="2OqNvi">
1170+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
1171+
</node>
1172+
</node>
1173+
<node concept="Xl_RD" id="2g6f$bb2AfU" role="3uHU7B">
1174+
<property role="Xl_RC" value="The trace was null for node \n" />
1175+
</node>
1176+
</node>
1177+
<node concept="Xl_RD" id="2g6f$bb2AeO" role="37wK5m">
1178+
<property role="Xl_RC" value="Tracing" />
1179+
</node>
1180+
</node>
11561181
</node>
11571182
</node>
1158-
<node concept="2qgKlT" id="1br4Vy9o_r" role="2OqNvi">
1159-
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
1160-
</node>
1161-
</node>
1162-
<node concept="Xl_RD" id="2g6f$bb2AfU" role="3uHU7B">
1163-
<property role="Xl_RC" value="The trace was null for node \n" />
11641183
</node>
11651184
</node>
1166-
<node concept="Xl_RD" id="2g6f$bb2AeO" role="37wK5m">
1167-
<property role="Xl_RC" value="Tracing" />
1168-
</node>
11691185
</node>
11701186
</node>
11711187
<node concept="3cpWs6" id="2g6f$bar1TO" role="3cqZAp" />
11721188
</node>
11731189
<node concept="3clFbC" id="2g6f$bar1p$" role="3clFbw">
1174-
<node concept="10Nm6u" id="2g6f$bar1Qb" role="3uHU7w" />
11751190
<node concept="37vLTw" id="2g6f$bar0T4" role="3uHU7B">
11761191
<ref role="3cqZAo" node="2g6f$baqub7" resolve="root" />
11771192
</node>
1193+
<node concept="10Nm6u" id="2g6f$bar1Qb" role="3uHU7w" />
11781194
</node>
11791195
</node>
11801196
<node concept="3cpWs8" id="5Ch7I6mj5T1" role="3cqZAp">

0 commit comments

Comments
 (0)