Skip to content

Commit 2c3e5f3

Browse files
mhuster23mhuster23
committed
fix(bulk-model-sync-solution): add missing progress indicator for mps import
1 parent e70c101 commit 2c3e5f3

File tree

1 file changed

+116
-31
lines changed

1 file changed

+116
-31
lines changed

‎bulk-model-sync-solution/solutions/org.modelix.mps.model.sync.bulk/models/org.modelix.mps.model.sync.bulk.mps‎

Lines changed: 116 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
5454
<reference id="1144433057691" name="classifier" index="1PxDUh" />
5555
</concept>
56+
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
5657
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
5758
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
5859
<child id="1068431790190" name="initializer" index="33vP2m" />
@@ -165,7 +166,6 @@
165166
<child id="1237731803878" name="copyFrom" index="I$8f6" />
166167
</concept>
167168
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
168-
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
169169
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
170170
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
171171
</language>
@@ -269,7 +269,7 @@
269269
</node>
270270
<node concept="3cpWs8" id="4fksUHVmlQt" role="3cqZAp">
271271
<node concept="3cpWsn" id="4fksUHVmlQu" role="3cpWs9">
272-
<property role="TrG5h" value="selectedModules" />
272+
<property role="TrG5h" value="includedModules" />
273273
<node concept="A3Dl8" id="4fksUHVmA3p" role="1tU5fm">
274274
<node concept="3uibUv" id="4fksUHVmA3q" role="A3Ik2">
275275
<ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
@@ -316,9 +316,7 @@
316316
<node concept="3cpWs8" id="4fksUHVmaF6" role="3cqZAp">
317317
<node concept="3cpWsn" id="4fksUHVmaF7" role="3cpWs9">
318318
<property role="TrG5h" value="current" />
319-
<node concept="3uibUv" id="4fksUHVmaF8" role="1tU5fm">
320-
<ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
321-
</node>
319+
<node concept="10Oyi0" id="2lDJgzjSuJd" role="1tU5fm" />
322320
<node concept="3cmrfG" id="4fksUHVmcgw" role="33vP2m">
323321
<property role="3cmrfH" value="0" />
324322
</node>
@@ -327,12 +325,10 @@
327325
<node concept="3cpWs8" id="4fksUHVmU9U" role="3cqZAp">
328326
<node concept="3cpWsn" id="4fksUHVmU9V" role="3cpWs9">
329327
<property role="TrG5h" value="numSelectedModules" />
330-
<node concept="3uibUv" id="4fksUHVmU9W" role="1tU5fm">
331-
<ref role="3uigEE" to="wyt6:~Integer" resolve="Integer" />
332-
</node>
328+
<node concept="10Oyi0" id="2lDJgzjSvzj" role="1tU5fm" />
333329
<node concept="2OqwBi" id="4fksUHVmX5E" role="33vP2m">
334330
<node concept="37vLTw" id="4fksUHVmWvN" role="2Oq$k0">
335-
<ref role="3cqZAo" node="4fksUHVmlQu" resolve="selectedModules" />
331+
<ref role="3cqZAo" node="4fksUHVmlQu" resolve="includedModules" />
336332
</node>
337333
<node concept="34oBXx" id="4fksUHVmXOu" role="2OqNvi" />
338334
</node>
@@ -489,7 +485,7 @@
489485
</node>
490486
</node>
491487
<node concept="37vLTw" id="4fksUHVnkAq" role="2GsD0m">
492-
<ref role="3cqZAo" node="4fksUHVmlQu" resolve="selectedModules" />
488+
<ref role="3cqZAo" node="4fksUHVmlQu" resolve="includedModules" />
493489
</node>
494490
</node>
495491
</node>
@@ -597,30 +593,33 @@
597593
<ref role="37wK5l" to="lui2:~ModelAccess.runWriteInEDT(java.lang.Runnable)" resolve="runWriteInEDT" />
598594
<node concept="1bVj0M" id="2rlXDkQJYC6" role="37wK5m">
599595
<node concept="3clFbS" id="2rlXDkQJYC7" role="1bW5cS">
596+
<node concept="3cpWs8" id="2lDJgzjSjy6" role="3cqZAp">
597+
<node concept="3cpWsn" id="2lDJgzjSjy9" role="3cpWs9">
598+
<property role="TrG5h" value="allModules" />
599+
<node concept="A3Dl8" id="2lDJgzjSjy3" role="1tU5fm">
600+
<node concept="3uibUv" id="2lDJgzjSkax" role="A3Ik2">
601+
<ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
602+
</node>
603+
</node>
604+
<node concept="2OqwBi" id="2lDJgzjSnOX" role="33vP2m">
605+
<node concept="2OqwBi" id="2lDJgzjSmV3" role="2Oq$k0">
606+
<node concept="37vLTw" id="2lDJgzjSm90" role="2Oq$k0">
607+
<ref role="3cqZAo" node="7gc0jqT1ApC" resolve="repoAsNode" />
608+
</node>
609+
<node concept="liA8E" id="2lDJgzjSnou" role="2OqNvi">
610+
<ref role="37wK5l" to="zxfz:~MPSRepositoryAsNode.getRepository()" resolve="getRepository" />
611+
</node>
612+
</node>
613+
<node concept="liA8E" id="2lDJgzjSohl" role="2OqNvi">
614+
<ref role="37wK5l" to="lui2:~SRepository.getModules()" resolve="getModules" />
615+
</node>
616+
</node>
617+
</node>
618+
</node>
600619
<node concept="3cpWs8" id="2lDJgzjRSyT" role="3cqZAp">
601620
<node concept="3cpWsn" id="2lDJgzjRSyW" role="3cpWs9">
602621
<property role="TrG5h" value="includedModules" />
603622
<node concept="2OqwBi" id="2lDJgzjRY1L" role="33vP2m">
604-
<node concept="2ShNRf" id="2lDJgzjRTWx" role="2Oq$k0">
605-
<node concept="Tc6Ow" id="2lDJgzjRTWi" role="2ShVmc">
606-
<node concept="3uibUv" id="2lDJgzjRTWj" role="HW$YZ">
607-
<ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
608-
</node>
609-
<node concept="2OqwBi" id="2lDJgzjRWGE" role="I$8f6">
610-
<node concept="2OqwBi" id="2lDJgzjRVIL" role="2Oq$k0">
611-
<node concept="37vLTw" id="2lDJgzjRV5l" role="2Oq$k0">
612-
<ref role="3cqZAo" node="7gc0jqT1ApC" resolve="repoAsNode" />
613-
</node>
614-
<node concept="liA8E" id="2lDJgzjRWjY" role="2OqNvi">
615-
<ref role="37wK5l" to="zxfz:~MPSRepositoryAsNode.getRepository()" resolve="getRepository" />
616-
</node>
617-
</node>
618-
<node concept="liA8E" id="2lDJgzjRX6x" role="2OqNvi">
619-
<ref role="37wK5l" to="lui2:~SRepository.getModules()" resolve="getModules" />
620-
</node>
621-
</node>
622-
</node>
623-
</node>
624623
<node concept="3zZkjj" id="2lDJgzjRYQG" role="2OqNvi">
625624
<node concept="1bVj0M" id="2lDJgzjRYQI" role="23t8la">
626625
<node concept="3clFbS" id="2lDJgzjRYQJ" role="1bW5cS">
@@ -651,6 +650,9 @@
651650
</node>
652651
</node>
653652
</node>
653+
<node concept="37vLTw" id="2lDJgzjSseQ" role="2Oq$k0">
654+
<ref role="3cqZAo" node="2lDJgzjSjy9" resolve="allModules" />
655+
</node>
654656
</node>
655657
<node concept="A3Dl8" id="2lDJgzjS3SW" role="1tU5fm">
656658
<node concept="3uibUv" id="2lDJgzjS3SZ" role="A3Ik2">
@@ -659,7 +661,29 @@
659661
</node>
660662
</node>
661663
</node>
662-
<node concept="3clFbH" id="2lDJgzjRSgq" role="3cqZAp" />
664+
<node concept="3clFbH" id="2lDJgzjS$Fc" role="3cqZAp" />
665+
<node concept="3cpWs8" id="2lDJgzjSu2F" role="3cqZAp">
666+
<node concept="3cpWsn" id="2lDJgzjSu2I" role="3cpWs9">
667+
<property role="TrG5h" value="current" />
668+
<node concept="10Oyi0" id="2lDJgzjSu2E" role="1tU5fm" />
669+
<node concept="3cmrfG" id="2lDJgzjSy9m" role="33vP2m">
670+
<property role="3cmrfH" value="0" />
671+
</node>
672+
</node>
673+
</node>
674+
<node concept="3cpWs8" id="2lDJgzjS_2K" role="3cqZAp">
675+
<node concept="3cpWsn" id="2lDJgzjS_2N" role="3cpWs9">
676+
<property role="TrG5h" value="numIncludedModules" />
677+
<node concept="10Oyi0" id="2lDJgzjS_2I" role="1tU5fm" />
678+
<node concept="2OqwBi" id="2lDJgzjSBUK" role="33vP2m">
679+
<node concept="37vLTw" id="2lDJgzjSBeB" role="2Oq$k0">
680+
<ref role="3cqZAo" node="2lDJgzjRSyW" resolve="includedModules" />
681+
</node>
682+
<node concept="34oBXx" id="2lDJgzjSCpO" role="2OqNvi" />
683+
</node>
684+
</node>
685+
</node>
686+
<node concept="3clFbH" id="2lDJgzjSiIn" role="3cqZAp" />
663687
<node concept="3clFbF" id="5hPHAtnuWei" role="3cqZAp">
664688
<node concept="2OqwBi" id="5hPHAtnuWES" role="3clFbG">
665689
<node concept="37vLTw" id="5hPHAtnuWeg" role="2Oq$k0">
@@ -674,6 +698,67 @@
674698
<property role="TrG5h" value="module" />
675699
</node>
676700
<node concept="3clFbS" id="2rlXDkQJYPU" role="2LFqv$">
701+
<node concept="3clFbF" id="2lDJgzjSD7j" role="3cqZAp">
702+
<node concept="d57v9" id="2lDJgzjSH$S" role="3clFbG">
703+
<node concept="3cmrfG" id="2lDJgzjSHUR" role="37vLTx">
704+
<property role="3cmrfH" value="1" />
705+
</node>
706+
<node concept="37vLTw" id="2lDJgzjSD7h" role="37vLTJ">
707+
<ref role="3cqZAo" node="2lDJgzjSu2I" resolve="current" />
708+
</node>
709+
</node>
710+
</node>
711+
<node concept="3clFbH" id="2lDJgzjSI$p" role="3cqZAp" />
712+
<node concept="3clFbF" id="2lDJgzjSJPT" role="3cqZAp">
713+
<node concept="2OqwBi" id="2lDJgzjSJPU" role="3clFbG">
714+
<node concept="10M0yZ" id="2lDJgzjSJPV" role="2Oq$k0">
715+
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
716+
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
717+
</node>
718+
<node concept="liA8E" id="2lDJgzjSJPW" role="2OqNvi">
719+
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
720+
<node concept="3cpWs3" id="2lDJgzjSJPX" role="37wK5m">
721+
<node concept="Xl_RD" id="2lDJgzjSJPY" role="3uHU7w">
722+
<property role="Xl_RC" value="'" />
723+
</node>
724+
<node concept="3cpWs3" id="2lDJgzjSJPZ" role="3uHU7B">
725+
<node concept="3cpWs3" id="2lDJgzjSJQ0" role="3uHU7B">
726+
<node concept="Xl_RD" id="2lDJgzjSJQ1" role="3uHU7w">
727+
<property role="Xl_RC" value=": '" />
728+
</node>
729+
<node concept="3cpWs3" id="2lDJgzjSJQ2" role="3uHU7B">
730+
<node concept="3cpWs3" id="2lDJgzjSJQ3" role="3uHU7B">
731+
<node concept="3cpWs3" id="2lDJgzjSJQ4" role="3uHU7B">
732+
<node concept="Xl_RD" id="2lDJgzjSJQ5" role="3uHU7B">
733+
<property role="Xl_RC" value="Importing module " />
734+
</node>
735+
<node concept="37vLTw" id="2lDJgzjSJQ6" role="3uHU7w">
736+
<ref role="3cqZAo" node="2lDJgzjSu2I" resolve="current" />
737+
</node>
738+
</node>
739+
<node concept="Xl_RD" id="2lDJgzjSJQ7" role="3uHU7w">
740+
<property role="Xl_RC" value=" of " />
741+
</node>
742+
</node>
743+
<node concept="37vLTw" id="2lDJgzjSJQ8" role="3uHU7w">
744+
<ref role="3cqZAo" node="2lDJgzjS_2N" resolve="numIncludedModules" />
745+
</node>
746+
</node>
747+
</node>
748+
<node concept="2OqwBi" id="2lDJgzjSJQ9" role="3uHU7w">
749+
<node concept="2GrUjf" id="2lDJgzjSJQa" role="2Oq$k0">
750+
<ref role="2Gs0qQ" node="2rlXDkQJYPQ" resolve="module" />
751+
</node>
752+
<node concept="liA8E" id="2lDJgzjSJQb" role="2OqNvi">
753+
<ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
754+
</node>
755+
</node>
756+
</node>
757+
</node>
758+
</node>
759+
</node>
760+
</node>
761+
<node concept="3clFbH" id="2lDJgzjSIU$" role="3cqZAp" />
677762
<node concept="3cpWs8" id="2rlXDkQK1M3" role="3cqZAp">
678763
<node concept="3cpWsn" id="2rlXDkQK1M4" role="3cpWs9">
679764
<property role="TrG5h" value="moduleFile" />

0 commit comments

Comments
 (0)