Skip to content

Commit 23c5c0a

Browse files
Merge pull request #534 from IETS3/bugfix/listOperationsCast_20203
Don't use generic Object type for result of collection operations
2 parents 8d238ac + e3e6d6d commit 23c5c0a

File tree

1 file changed

+210
-0
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template

1 file changed

+210
-0
lines changed

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/[email protected]

Lines changed: 210 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5057,6 +5057,36 @@
50575057
<property role="TrG5h" value="origList" />
50585058
<node concept="3uibUv" id="2YSwz9FBc8D" role="1tU5fm">
50595059
<ref role="3uigEE" to="j10v:~PVector" resolve="PVector" />
5060+
<node concept="3uibUv" id="ZMCvctH8f8" role="11_B2D">
5061+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
5062+
<node concept="29HgVG" id="ZMCvctHkIs" role="lGtFl">
5063+
<node concept="3NFfHV" id="ZMCvctHkIt" role="3NFExx">
5064+
<node concept="3clFbS" id="ZMCvctHkIu" role="2VODD2">
5065+
<node concept="3clFbF" id="ZMCvctHmtb" role="3cqZAp">
5066+
<node concept="2OqwBi" id="ZMCvctHmtc" role="3clFbG">
5067+
<node concept="1PxgMI" id="ZMCvctHmtd" role="2Oq$k0">
5068+
<node concept="chp4Y" id="ZMCvctHmte" role="3oSUPX">
5069+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
5070+
</node>
5071+
<node concept="2OqwBi" id="ZMCvctHmtf" role="1m5AlR">
5072+
<node concept="2OqwBi" id="ZMCvctHmtg" role="2Oq$k0">
5073+
<node concept="3TrEf2" id="ZMCvctHmth" role="2OqNvi">
5074+
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
5075+
</node>
5076+
<node concept="30H73N" id="ZMCvctHmti" role="2Oq$k0" />
5077+
</node>
5078+
<node concept="3JvlWi" id="ZMCvctHmtj" role="2OqNvi" />
5079+
</node>
5080+
</node>
5081+
<node concept="3TrEf2" id="ZMCvctHmtk" role="2OqNvi">
5082+
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
5083+
</node>
5084+
</node>
5085+
</node>
5086+
</node>
5087+
</node>
5088+
</node>
5089+
</node>
50605090
</node>
50615091
<node concept="37vLTw" id="2YSwz9FBfTp" role="33vP2m">
50625092
<ref role="3cqZAo" node="7Pk458DyXut" resolve="tpv" />
@@ -5410,6 +5440,36 @@
54105440
<property role="TrG5h" value="origList" />
54115441
<node concept="3uibUv" id="2YSwz9FMPw1" role="1tU5fm">
54125442
<ref role="3uigEE" to="j10v:~PVector" resolve="PVector" />
5443+
<node concept="3uibUv" id="ZMCvctHKl$" role="11_B2D">
5444+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
5445+
<node concept="29HgVG" id="ZMCvctHSjc" role="lGtFl">
5446+
<node concept="3NFfHV" id="ZMCvctHSjd" role="3NFExx">
5447+
<node concept="3clFbS" id="ZMCvctHSje" role="2VODD2">
5448+
<node concept="3clFbF" id="ZMCvctHYJx" role="3cqZAp">
5449+
<node concept="2OqwBi" id="ZMCvctHYJy" role="3clFbG">
5450+
<node concept="1PxgMI" id="ZMCvctHYJz" role="2Oq$k0">
5451+
<node concept="chp4Y" id="ZMCvctHYJ$" role="3oSUPX">
5452+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
5453+
</node>
5454+
<node concept="2OqwBi" id="ZMCvctHYJ_" role="1m5AlR">
5455+
<node concept="2OqwBi" id="ZMCvctHYJA" role="2Oq$k0">
5456+
<node concept="3TrEf2" id="ZMCvctHYJB" role="2OqNvi">
5457+
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
5458+
</node>
5459+
<node concept="30H73N" id="ZMCvctHYJC" role="2Oq$k0" />
5460+
</node>
5461+
<node concept="3JvlWi" id="ZMCvctHYJD" role="2OqNvi" />
5462+
</node>
5463+
</node>
5464+
<node concept="3TrEf2" id="ZMCvctHYJE" role="2OqNvi">
5465+
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
5466+
</node>
5467+
</node>
5468+
</node>
5469+
</node>
5470+
</node>
5471+
</node>
5472+
</node>
54135473
</node>
54145474
<node concept="37vLTw" id="2YSwz9FMPw2" role="33vP2m">
54155475
<ref role="3cqZAo" node="7Pk458EOR9D" resolve="tpv" />
@@ -5673,6 +5733,36 @@
56735733
<property role="TrG5h" value="rev" />
56745734
<node concept="3uibUv" id="4F_NhVzDBJh" role="1tU5fm">
56755735
<ref role="3uigEE" to="j10v:~PVector" resolve="PVector" />
5736+
<node concept="3uibUv" id="ZMCvctIHUJ" role="11_B2D">
5737+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
5738+
<node concept="29HgVG" id="ZMCvctIIrB" role="lGtFl">
5739+
<node concept="3NFfHV" id="ZMCvctIIrC" role="3NFExx">
5740+
<node concept="3clFbS" id="ZMCvctIIrD" role="2VODD2">
5741+
<node concept="3clFbF" id="ZMCvctIVnF" role="3cqZAp">
5742+
<node concept="2OqwBi" id="ZMCvctIVnG" role="3clFbG">
5743+
<node concept="1PxgMI" id="ZMCvctIVnH" role="2Oq$k0">
5744+
<node concept="chp4Y" id="ZMCvctIVnI" role="3oSUPX">
5745+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
5746+
</node>
5747+
<node concept="2OqwBi" id="ZMCvctIVnJ" role="1m5AlR">
5748+
<node concept="2OqwBi" id="ZMCvctIVnK" role="2Oq$k0">
5749+
<node concept="3TrEf2" id="ZMCvctIVnL" role="2OqNvi">
5750+
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
5751+
</node>
5752+
<node concept="30H73N" id="ZMCvctIVnM" role="2Oq$k0" />
5753+
</node>
5754+
<node concept="3JvlWi" id="ZMCvctIVnN" role="2OqNvi" />
5755+
</node>
5756+
</node>
5757+
<node concept="3TrEf2" id="ZMCvctIVnO" role="2OqNvi">
5758+
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
5759+
</node>
5760+
</node>
5761+
</node>
5762+
</node>
5763+
</node>
5764+
</node>
5765+
</node>
56765766
</node>
56775767
<node concept="2YIFZM" id="4F_NhVzk$OA" role="33vP2m">
56785768
<ref role="1Pybhc" to="j10v:~Empty" resolve="Empty" />
@@ -6112,6 +6202,36 @@
61126202
<node concept="2YIFZM" id="3pkOvRwPnOe" role="37wK5m">
61136203
<ref role="37wK5l" to="1ctc:~Collectors.toList()" resolve="toList" />
61146204
<ref role="1Pybhc" to="1ctc:~Collectors" resolve="Collectors" />
6205+
<node concept="3uibUv" id="ZMCvctwRIx" role="3PaCim">
6206+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
6207+
<node concept="29HgVG" id="ZMCvctwVwQ" role="lGtFl">
6208+
<node concept="3NFfHV" id="ZMCvctwVwR" role="3NFExx">
6209+
<node concept="3clFbS" id="ZMCvctwVwS" role="2VODD2">
6210+
<node concept="3clFbF" id="ZMCvctx5dp" role="3cqZAp">
6211+
<node concept="2OqwBi" id="ZMCvctx5dr" role="3clFbG">
6212+
<node concept="1PxgMI" id="ZMCvctx5ds" role="2Oq$k0">
6213+
<node concept="chp4Y" id="ZMCvctx5dt" role="3oSUPX">
6214+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
6215+
</node>
6216+
<node concept="2OqwBi" id="ZMCvctx5du" role="1m5AlR">
6217+
<node concept="2OqwBi" id="ZMCvctx5dv" role="2Oq$k0">
6218+
<node concept="3TrEf2" id="ZMCvctx5dw" role="2OqNvi">
6219+
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
6220+
</node>
6221+
<node concept="30H73N" id="ZMCvctx5dx" role="2Oq$k0" />
6222+
</node>
6223+
<node concept="3JvlWi" id="ZMCvctx5dy" role="2OqNvi" />
6224+
</node>
6225+
</node>
6226+
<node concept="3TrEf2" id="ZMCvctx5dz" role="2OqNvi">
6227+
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
6228+
</node>
6229+
</node>
6230+
</node>
6231+
</node>
6232+
</node>
6233+
</node>
6234+
</node>
61156235
</node>
61166236
</node>
61176237
</node>
@@ -6847,6 +6967,36 @@
68476967
<node concept="2YIFZM" id="3pkOvRwoJMN" role="37wK5m">
68486968
<ref role="37wK5l" to="1ctc:~Collectors.toList()" resolve="toList" />
68496969
<ref role="1Pybhc" to="1ctc:~Collectors" resolve="Collectors" />
6970+
<node concept="3uibUv" id="ZMCvctxulU" role="3PaCim">
6971+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
6972+
<node concept="29HgVG" id="ZMCvctxGun" role="lGtFl">
6973+
<node concept="3NFfHV" id="ZMCvctxGuo" role="3NFExx">
6974+
<node concept="3clFbS" id="ZMCvctxGup" role="2VODD2">
6975+
<node concept="3clFbF" id="DoUHVQS6N1" role="3cqZAp">
6976+
<node concept="2OqwBi" id="DoUHVQS6N3" role="3clFbG">
6977+
<node concept="1PxgMI" id="DoUHVQS6N4" role="2Oq$k0">
6978+
<node concept="chp4Y" id="DoUHVQS6N5" role="3oSUPX">
6979+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
6980+
</node>
6981+
<node concept="2OqwBi" id="DoUHVQS6N6" role="1m5AlR">
6982+
<node concept="2OqwBi" id="DoUHVQS6N7" role="2Oq$k0">
6983+
<node concept="3TrEf2" id="DoUHVQS6N8" role="2OqNvi">
6984+
<ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
6985+
</node>
6986+
<node concept="30H73N" id="DoUHVQS6N9" role="2Oq$k0" />
6987+
</node>
6988+
<node concept="3JvlWi" id="DoUHVQS6Na" role="2OqNvi" />
6989+
</node>
6990+
</node>
6991+
<node concept="3TrEf2" id="DoUHVQS6Nb" role="2OqNvi">
6992+
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
6993+
</node>
6994+
</node>
6995+
</node>
6996+
</node>
6997+
</node>
6998+
</node>
6999+
</node>
68507000
</node>
68517001
</node>
68527002
</node>
@@ -7058,6 +7208,36 @@
70587208
<node concept="2YIFZM" id="27xhIwg4nyK" role="37wK5m">
70597209
<ref role="37wK5l" to="1ctc:~Collectors.toList()" resolve="toList" />
70607210
<ref role="1Pybhc" to="1ctc:~Collectors" resolve="Collectors" />
7211+
<node concept="3uibUv" id="ZMCvctxVAS" role="3PaCim">
7212+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
7213+
<node concept="29HgVG" id="ZMCvcty95d" role="lGtFl">
7214+
<node concept="3NFfHV" id="ZMCvcty95e" role="3NFExx">
7215+
<node concept="3clFbS" id="ZMCvcty95f" role="2VODD2">
7216+
<node concept="3clFbF" id="ZMCvctybKL" role="3cqZAp">
7217+
<node concept="2OqwBi" id="ZMCvctybKN" role="3clFbG">
7218+
<node concept="1PxgMI" id="ZMCvctybKO" role="2Oq$k0">
7219+
<node concept="chp4Y" id="ZMCvctybKP" role="3oSUPX">
7220+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
7221+
</node>
7222+
<node concept="2OqwBi" id="ZMCvctybKQ" role="1m5AlR">
7223+
<node concept="2OqwBi" id="ZMCvctybKR" role="2Oq$k0">
7224+
<node concept="3TrEf2" id="ZMCvctybKS" role="2OqNvi">
7225+
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
7226+
</node>
7227+
<node concept="30H73N" id="ZMCvctybKT" role="2Oq$k0" />
7228+
</node>
7229+
<node concept="3JvlWi" id="ZMCvctybKU" role="2OqNvi" />
7230+
</node>
7231+
</node>
7232+
<node concept="3TrEf2" id="ZMCvctybKV" role="2OqNvi">
7233+
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
7234+
</node>
7235+
</node>
7236+
</node>
7237+
</node>
7238+
</node>
7239+
</node>
7240+
</node>
70617241
</node>
70627242
</node>
70637243
</node>
@@ -8404,6 +8584,36 @@
84048584
<node concept="2YIFZM" id="7q4cgljJ7l$" role="37wK5m">
84058585
<ref role="37wK5l" to="1ctc:~Collectors.toList()" resolve="toList" />
84068586
<ref role="1Pybhc" to="1ctc:~Collectors" resolve="Collectors" />
8587+
<node concept="3uibUv" id="ZMCvctzQPs" role="3PaCim">
8588+
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
8589+
<node concept="29HgVG" id="ZMCvct$3ZB" role="lGtFl">
8590+
<node concept="3NFfHV" id="ZMCvct$3ZC" role="3NFExx">
8591+
<node concept="3clFbS" id="ZMCvct$3ZD" role="2VODD2">
8592+
<node concept="3clFbF" id="ZMCvct$6ER" role="3cqZAp">
8593+
<node concept="2OqwBi" id="ZMCvct$6ET" role="3clFbG">
8594+
<node concept="1PxgMI" id="ZMCvct$6EU" role="2Oq$k0">
8595+
<node concept="chp4Y" id="ZMCvct$6EV" role="3oSUPX">
8596+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
8597+
</node>
8598+
<node concept="2OqwBi" id="ZMCvct$6EW" role="1m5AlR">
8599+
<node concept="2OqwBi" id="ZMCvct$6EX" role="2Oq$k0">
8600+
<node concept="3TrEf2" id="ZMCvct$6EY" role="2OqNvi">
8601+
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
8602+
</node>
8603+
<node concept="30H73N" id="ZMCvct$6EZ" role="2Oq$k0" />
8604+
</node>
8605+
<node concept="3JvlWi" id="ZMCvct$6F0" role="2OqNvi" />
8606+
</node>
8607+
</node>
8608+
<node concept="3TrEf2" id="ZMCvct$6F1" role="2OqNvi">
8609+
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
8610+
</node>
8611+
</node>
8612+
</node>
8613+
</node>
8614+
</node>
8615+
</node>
8616+
</node>
84078617
</node>
84088618
</node>
84098619
</node>

0 commit comments

Comments
 (0)