Skip to content

Commit 8eb704b

Browse files
sergej-koscejevsergej-koscejev
authored
Merge pull request #1708 from JetBrains/artem/261next
Refactor extensions of j.m.l.editor generator not to use transitition code
2 parents 791882b + dd3374b commit 8eb704b

File tree

16 files changed

+694
-742
lines changed

16 files changed

+694
-742
lines changed

‎code/celllayout/languages/de.itemis.mps.editor.celllayout/generator/template/[email protected]‎

Lines changed: 61 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<import index="xggr" ref="r:12584d60-2d80-4ca9-9c6e-b79d499da0cf(de.itemis.mps.editor.celllayout.layout)" />
2020
<import index="qxi4" ref="r:45c19b6d-dd9a-4f15-973f-0267c5e76303(de.itemis.mps.editor.celllayout.runtime)" />
2121
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
22+
<import index="nivk" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.editor.runtime.descriptor(MPS.Editor/)" />
2223
<import index="pvux" ref="r:bb8c05bc-4758-44fe-b1ab-f9faa5a73d31(de.itemis.mps.editor.celllayout.structure)" implicit="true" />
2324
<import index="hy9h" ref="r:131747d1-61c1-40bf-8a0d-f19908d3d142(de.itemis.mps.editor.celllayout.behavior)" implicit="true" />
2425
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
@@ -59,7 +60,10 @@
5960
<child id="1070534934091" name="type" index="10QFUM" />
6061
<child id="1070534934092" name="expression" index="10QFUP" />
6162
</concept>
62-
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
63+
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
64+
<property id="1075300953594" name="abstractClass" index="1sVAO0" />
65+
<child id="1095933932569" name="implementedInterface" index="EKbjA" />
66+
</concept>
6367
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
6468
<property id="1176718929932" name="isFinal" index="3TUv4t" />
6569
<child id="1068431790190" name="initializer" index="33vP2m" />
@@ -93,7 +97,6 @@
9397
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
9498
<property id="1068580123138" name="value" index="3clFbU" />
9599
</concept>
96-
<concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
97100
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
98101
<property id="1068580320021" name="value" index="3cmrfH" />
99102
</concept>
@@ -550,11 +553,8 @@
550553
<ref role="3gUMe" to="pvux:43ViAfTrykj" resolve="HorizontalLineCell" />
551554
<node concept="312cEu" id="fXNkb_1" role="13RCb5">
552555
<property role="TrG5h" value="_context_class_" />
553-
<node concept="3clFbW" id="3NbAIGiCiyP" role="jymVt">
554-
<node concept="3cqZAl" id="3NbAIGiCiyQ" role="3clF45" />
555-
<node concept="3Tm1VV" id="3NbAIGiCiyR" role="1B3o_S" />
556-
<node concept="3clFbS" id="3NbAIGiCiyS" role="3clF47" />
557-
</node>
556+
<property role="1sVAO0" value="true" />
557+
<node concept="2tJIrI" id="3AHmCKdDKt9" role="jymVt" />
558558
<node concept="3clFb_" id="fXNkb_2" role="jymVt">
559559
<property role="TrG5h" value="_cell_factory_method_" />
560560
<node concept="3uibUv" id="5Hr2i_R0JJb" role="3clF45">
@@ -567,11 +567,11 @@
567567
<node concept="2ShNRf" id="hDIBphp" role="33vP2m">
568568
<node concept="1pGfFk" id="hDIBphr" role="2ShVmc">
569569
<ref role="37wK5l" to="mc8f:4U82Y3yZF0a" resolve="HorizontalLineCell" />
570-
<node concept="37vLTw" id="2BHiRxgm72F" role="37wK5m">
571-
<ref role="3cqZAo" node="fXNkb_a" resolve="editorContext" />
570+
<node concept="1rXfSq" id="3AHmCKdDNf6" role="37wK5m">
571+
<ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
572572
</node>
573-
<node concept="37vLTw" id="2BHiRxgm6mP" role="37wK5m">
574-
<ref role="3cqZAo" node="fXNkb_c" resolve="node" />
573+
<node concept="1rXfSq" id="3AHmCKdDNss" role="37wK5m">
574+
<ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
575575
</node>
576576
</node>
577577
</node>
@@ -609,20 +609,10 @@
609609
</node>
610610
</node>
611611
</node>
612-
<node concept="37vLTG" id="fXNkb_a" role="3clF46">
613-
<property role="TrG5h" value="editorContext" />
614-
<node concept="3uibUv" id="3aDel7vYG3y" role="1tU5fm">
615-
<ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
616-
</node>
617-
</node>
618612
<node concept="raruj" id="fXNkb_Q" role="lGtFl">
619-
<ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
613+
<ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
620614
</node>
621615
<node concept="3Tm6S6" id="1y7DiaVv2W6" role="1B3o_S" />
622-
<node concept="37vLTG" id="fXNkb_c" role="3clF46">
623-
<property role="TrG5h" value="node" />
624-
<node concept="3Tqbb2" id="i2nPOD4" role="1tU5fm" />
625-
</node>
626616
<node concept="17Uvod" id="fXNkb_R" role="lGtFl">
627617
<property role="2qtEX9" value="name" />
628618
<property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -641,22 +631,7 @@
641631
</node>
642632
</node>
643633
</node>
644-
<node concept="3clFb_" id="5KDKp$lLLi0" role="jymVt">
645-
<property role="TrG5h" value="newFactoryMethod" />
646-
<node concept="3uibUv" id="5KDKp$lLLi1" role="3clF45">
647-
<ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
648-
</node>
649-
<node concept="3clFbS" id="5KDKp$lLLi2" role="3clF47">
650-
<node concept="3cpWs6" id="5KDKp$lLLi3" role="3cqZAp">
651-
<node concept="10Nm6u" id="5KDKp$lLLi4" role="3cqZAk" />
652-
</node>
653-
</node>
654-
<node concept="raruj" id="5KDKp$lLLi5" role="lGtFl" />
655-
<node concept="5jKBG" id="5KDKp$lLLi6" role="lGtFl">
656-
<ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
657-
</node>
658-
<node concept="3Tm6S6" id="5KDKp$lLLi7" role="1B3o_S" />
659-
</node>
634+
<node concept="2tJIrI" id="3AHmCKdDJXh" role="jymVt" />
660635
<node concept="2tJIrI" id="43ViAfTsPYC" role="jymVt">
661636
<node concept="raruj" id="43ViAfTsQ3d" role="lGtFl" />
662637
<node concept="5jKBG" id="43ViAfTsQ3o" role="lGtFl">
@@ -684,6 +659,9 @@
684659
</node>
685660
</node>
686661
<node concept="3Tm1VV" id="h9B3Lp5" role="1B3o_S" />
662+
<node concept="3uibUv" id="3AHmCKdDMzw" role="EKbjA">
663+
<ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
664+
</node>
687665
</node>
688666
</node>
689667
<node concept="jVnub" id="43ViAfTumJT">
@@ -740,11 +718,8 @@
740718
<ref role="3gUMe" to="pvux:7d0q5VH9fgO" resolve="VerticalLineCell" />
741719
<node concept="312cEu" id="7d0q5VH9hy_" role="13RCb5">
742720
<property role="TrG5h" value="_context_class_" />
743-
<node concept="3clFbW" id="7d0q5VH9hyA" role="jymVt">
744-
<node concept="3cqZAl" id="7d0q5VH9hyB" role="3clF45" />
745-
<node concept="3Tm1VV" id="7d0q5VH9hyC" role="1B3o_S" />
746-
<node concept="3clFbS" id="7d0q5VH9hyD" role="3clF47" />
747-
</node>
721+
<property role="1sVAO0" value="true" />
722+
<node concept="2tJIrI" id="3AHmCKdDXCw" role="jymVt" />
748723
<node concept="3clFb_" id="7d0q5VH9hyE" role="jymVt">
749724
<property role="TrG5h" value="_cell_factory_method_" />
750725
<node concept="3uibUv" id="7d0q5VH9hyF" role="3clF45">
@@ -757,11 +732,11 @@
757732
<node concept="2ShNRf" id="7d0q5VH9hyJ" role="33vP2m">
758733
<node concept="1pGfFk" id="7d0q5VH9hyK" role="2ShVmc">
759734
<ref role="37wK5l" to="mc8f:7d0q5VH9zQ8" resolve="VerticalLineCell" />
760-
<node concept="37vLTw" id="7d0q5VH9hyL" role="37wK5m">
761-
<ref role="3cqZAo" node="7d0q5VH9hz0" resolve="editorContext" />
735+
<node concept="1rXfSq" id="3AHmCKdDWE2" role="37wK5m">
736+
<ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
762737
</node>
763-
<node concept="37vLTw" id="7d0q5VH9hyM" role="37wK5m">
764-
<ref role="3cqZAo" node="7d0q5VH9hz4" resolve="node" />
738+
<node concept="1rXfSq" id="3AHmCKdDWPw" role="37wK5m">
739+
<ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
765740
</node>
766741
</node>
767742
</node>
@@ -799,20 +774,10 @@
799774
</node>
800775
</node>
801776
</node>
802-
<node concept="37vLTG" id="7d0q5VH9hz0" role="3clF46">
803-
<property role="TrG5h" value="editorContext" />
804-
<node concept="3uibUv" id="7d0q5VH9hz1" role="1tU5fm">
805-
<ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
806-
</node>
807-
</node>
808777
<node concept="raruj" id="7d0q5VH9hz2" role="lGtFl">
809-
<ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
778+
<ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
810779
</node>
811780
<node concept="3Tm6S6" id="7d0q5VH9hz3" role="1B3o_S" />
812-
<node concept="37vLTG" id="7d0q5VH9hz4" role="3clF46">
813-
<property role="TrG5h" value="node" />
814-
<node concept="3Tqbb2" id="7d0q5VH9hz5" role="1tU5fm" />
815-
</node>
816781
<node concept="17Uvod" id="7d0q5VH9hz6" role="lGtFl">
817782
<property role="2qtEX9" value="name" />
818783
<property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
@@ -831,22 +796,6 @@
831796
</node>
832797
</node>
833798
</node>
834-
<node concept="3clFb_" id="7d0q5VH9hze" role="jymVt">
835-
<property role="TrG5h" value="newFactoryMethod" />
836-
<node concept="3uibUv" id="7d0q5VH9hzf" role="3clF45">
837-
<ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
838-
</node>
839-
<node concept="3clFbS" id="7d0q5VH9hzg" role="3clF47">
840-
<node concept="3cpWs6" id="7d0q5VH9hzh" role="3cqZAp">
841-
<node concept="10Nm6u" id="7d0q5VH9hzi" role="3cqZAk" />
842-
</node>
843-
</node>
844-
<node concept="raruj" id="7d0q5VH9hzj" role="lGtFl" />
845-
<node concept="5jKBG" id="7d0q5VH9hzk" role="lGtFl">
846-
<ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
847-
</node>
848-
<node concept="3Tm6S6" id="7d0q5VH9hzl" role="1B3o_S" />
849-
</node>
850799
<node concept="2tJIrI" id="7d0q5VH9hzm" role="jymVt">
851800
<node concept="raruj" id="7d0q5VH9hzn" role="lGtFl" />
852801
<node concept="5jKBG" id="7d0q5VH9hzo" role="lGtFl">
@@ -874,6 +823,9 @@
874823
</node>
875824
</node>
876825
<node concept="3Tm1VV" id="7d0q5VH9hzz" role="1B3o_S" />
826+
<node concept="3uibUv" id="3AHmCKdDVTm" role="EKbjA">
827+
<ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
828+
</node>
877829
</node>
878830
</node>
879831
<node concept="jVnub" id="3ATi8gIpzuu">
@@ -901,11 +853,8 @@
901853
<ref role="3gUMe" to="pvux:3ATi8gIrB$_" resolve="TopDownLayoutCell" />
902854
<node concept="312cEu" id="fXNKQOH" role="13RCb5">
903855
<property role="TrG5h" value="_context_class_" />
904-
<node concept="3clFbW" id="3NbAIGiCjbF" role="jymVt">
905-
<node concept="3cqZAl" id="3NbAIGiCjbG" role="3clF45" />
906-
<node concept="3Tm1VV" id="3NbAIGiCjbH" role="1B3o_S" />
907-
<node concept="3clFbS" id="3NbAIGiCjbI" role="3clF47" />
908-
</node>
856+
<property role="1sVAO0" value="true" />
857+
<node concept="2tJIrI" id="3AHmCKdDPxn" role="jymVt" />
909858
<node concept="3clFb_" id="fXNLFfO" role="jymVt">
910859
<property role="TrG5h" value="_cell_factory_method_CustomFactory" />
911860
<node concept="3uibUv" id="5Hr2i_R0Q0J" role="3clF45">
@@ -1107,25 +1056,47 @@
11071056
<property role="3TUv4t" value="true" />
11081057
<node concept="3Tqbb2" id="i2nPOFr" role="1tU5fm" />
11091058
</node>
1110-
<node concept="raruj" id="fXNLFgK" role="lGtFl">
1111-
<ref role="2sdACS" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
1112-
</node>
1059+
<node concept="raruj" id="fXNLFgK" role="lGtFl" />
11131060
</node>
11141061
<node concept="3clFb_" id="5KDKp$lLLk8" role="jymVt">
1115-
<property role="TrG5h" value="newFactoryMethod" />
1062+
<property role="TrG5h" value="_cell_factory_method_" />
11161063
<node concept="3uibUv" id="5KDKp$lLLk9" role="3clF45">
11171064
<ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
11181065
</node>
11191066
<node concept="3clFbS" id="5KDKp$lLLka" role="3clF47">
11201067
<node concept="3cpWs6" id="5KDKp$lLLkb" role="3cqZAp">
1121-
<node concept="10Nm6u" id="5KDKp$lLLkc" role="3cqZAk" />
1068+
<node concept="1rXfSq" id="3AHmCKdDTnf" role="3cqZAk">
1069+
<ref role="37wK5l" node="fXNLFfO" resolve="_cell_factory_method_CustomFactory" />
1070+
<node concept="1rXfSq" id="3AHmCKdDTDj" role="37wK5m">
1071+
<ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getEditorContext()" resolve="getEditorContext" />
1072+
</node>
1073+
<node concept="1rXfSq" id="3AHmCKdDUcI" role="37wK5m">
1074+
<ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode()" resolve="getNode" />
1075+
</node>
1076+
</node>
11221077
</node>
11231078
</node>
1124-
<node concept="raruj" id="5KDKp$lLLkd" role="lGtFl" />
1125-
<node concept="5jKBG" id="5KDKp$lLLke" role="lGtFl">
1126-
<ref role="v9R2y" to="tpc3:2dNBF9rt5kk" resolve="template_cellFactoryCompatibility" />
1079+
<node concept="raruj" id="5KDKp$lLLkd" role="lGtFl">
1080+
<ref role="2sdACS" to="tpc3:2dNBF9rpTiT" resolve="cellFactory.factoryMethod" />
11271081
</node>
11281082
<node concept="3Tm6S6" id="5KDKp$lLLkf" role="1B3o_S" />
1083+
<node concept="17Uvod" id="3AHmCKdDSCH" role="lGtFl">
1084+
<property role="2qtEX9" value="name" />
1085+
<property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
1086+
<node concept="3zFVjK" id="3AHmCKdDSCI" role="3zH0cK">
1087+
<node concept="3clFbS" id="3AHmCKdDSCJ" role="2VODD2">
1088+
<node concept="3clFbF" id="3AHmCKdDSQh" role="3cqZAp">
1089+
<node concept="2OqwBi" id="3AHmCKdDSQi" role="3clFbG">
1090+
<node concept="2qgKlT" id="3AHmCKdDSQj" role="2OqNvi">
1091+
<ref role="37wK5l" to="tpcb:hHfE2BD" resolve="getFactoryMethodName" />
1092+
<node concept="1iwH7S" id="3AHmCKdDSQk" role="37wK5m" />
1093+
</node>
1094+
<node concept="30H73N" id="3AHmCKdDSQl" role="2Oq$k0" />
1095+
</node>
1096+
</node>
1097+
</node>
1098+
</node>
1099+
</node>
11291100
</node>
11301101
<node concept="3clFb_" id="2af7$rtsxxN" role="jymVt">
11311102
<property role="TrG5h" value="createChildCell" />
@@ -1161,6 +1132,9 @@
11611132
</node>
11621133
</node>
11631134
<node concept="3Tm1VV" id="h9B3Loo" role="1B3o_S" />
1135+
<node concept="3uibUv" id="3AHmCKdDQeC" role="EKbjA">
1136+
<ref role="3uigEE" to="nivk:~EditorBuilderEnvironment" resolve="EditorBuilderEnvironment" />
1137+
</node>
11641138
</node>
11651139
</node>
11661140
</model>

0 commit comments

Comments
 (0)