Skip to content

fix(genjava.base): use Object for heterogeneous lists for the join type + support the empty type #1580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexanderpann wants to merge 3 commits into
base: maintenance/mps20251
Choose a base branch
from
Open

fix(genjava.base): use Object for heterogeneous lists for the join type + support the empty type #1580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26b40ec
fix(genjava.base): use Object for heterogeneous lists for the join type
Dec 22, 2025
3ce7294
feature(genjava): add a generator for the empty type
Dec 22, 2025
7a0e4b5
update the changelog
Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ The project does _not_ follow Semantic Versioning and the changes are documented

- Variability: The intention "Update all configurations" for feature models has been improved: Now a modal dialog with a progress bar and some additional information is shown. The process is now completely sequential, improving stability. Moreover, there is some timing output in the log. Finally, performance has been improved by postponing the event handling for all changes to the involved models.
- Variability: The intention "Adapt to changes in feature model" and related quickfixes also have been improved similarly to the improvements on "Update all configurations".
- The empty type is now supported by the Java generator.

### Fixed

- Variability: The propagation of configuration updates to referencing configurations has been improved. Due to this optimization, it needs much less CPU time now.
- The join type is now correctly supported by the Java generator.

### Changed

Expand Down
58 changes: 36 additions & 22 deletions ....core.expr.genjava.base/generator/template/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17093,32 +17093,46 @@
<node concept="3aamgX" id="3JZRUPd2DJt" role="3aUrZf">
<property role="36QftV" value="true" />
<ref role="30HIoZ" to="hm2y:7VuYlCQZ3ll" resolve="JoinType" />
<node concept="1Koe21" id="3JZRUPd2EpX" role="1lVwrX">
<node concept="3clFb_" id="3JZRUPd2Eqg" role="1Koe22">
<node concept="1Koe21" id="6I8PWVHcWwt" role="1lVwrX">
<node concept="3clFb_" id="6I8PWVHcWwu" role="1Koe22">
<property role="DiZV1" value="false" />
<property role="od$2w" value="false" />
<property role="2aFKle" value="false" />
<property role="TrG5h" value="foo" />
<node concept="3Tm1VV" id="3JZRUPd2Eqj" role="1B3o_S" />
<node concept="3cqZAl" id="3JZRUPd2Faq" role="3clF45" />
<node concept="3clFbS" id="3JZRUPd2Eqm" role="3clF47">
<node concept="3cpWs8" id="3JZRUPd2FaJ" role="3cqZAp">
<node concept="3cpWsn" id="3JZRUPd2FaM" role="3cpWs9">
<property role="TrG5h" value="s" />
<node concept="17QB3L" id="3JZRUPd2FaI" role="1tU5fm">
<node concept="raruj" id="3JZRUPd2Fbe" role="lGtFl" />
<node concept="29HgVG" id="3JZRUPd2Fl7" role="lGtFl">
<node concept="3NFfHV" id="3JZRUPd2Flz" role="3NFExx">
<node concept="3clFbS" id="3JZRUPd2Fl$" role="2VODD2">
<node concept="3clFbF" id="3JZRUPd2Fpr" role="3cqZAp">
<node concept="2OqwBi" id="3JZRUPd2F_a" role="3clFbG">
<node concept="30H73N" id="3JZRUPd2Fpq" role="2Oq$k0" />
<node concept="3JvlWi" id="3JZRUPd2Gis" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="6I8PWVHcWwv" role="1B3o_S" />
<node concept="3cqZAl" id="6I8PWVHcWww" role="3clF45" />
<node concept="3clFbS" id="6I8PWVHcWwx" role="3clF47">
<node concept="3cpWs8" id="6I8PWVHcWwy" role="3cqZAp">
<node concept="3cpWsn" id="6I8PWVHcWwz" role="3cpWs9">
<property role="TrG5h" value="l" />
<node concept="3uibUv" id="6I8PWVHcWw$" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
<node concept="raruj" id="6I8PWVHcWw_" role="lGtFl" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3aamgX" id="6I8PWVHPCMw" role="3aUrZf">
<property role="36QftV" value="true" />
<ref role="30HIoZ" to="hm2y:3tcv7J0pmjC" resolve="EmptyType" />
<node concept="1Koe21" id="6I8PWVHPCMx" role="1lVwrX">
<node concept="3clFb_" id="6I8PWVHPCMy" role="1Koe22">
<property role="DiZV1" value="false" />
<property role="od$2w" value="false" />
<property role="2aFKle" value="false" />
<property role="TrG5h" value="foo" />
<node concept="3Tm1VV" id="6I8PWVHPCMz" role="1B3o_S" />
<node concept="3cqZAl" id="6I8PWVHPCM$" role="3clF45" />
<node concept="3clFbS" id="6I8PWVHPCM_" role="3clF47">
<node concept="3cpWs8" id="6I8PWVHPCMA" role="3cqZAp">
<node concept="3cpWsn" id="6I8PWVHPCMB" role="3cpWs9">
<property role="TrG5h" value="l" />
<node concept="3uibUv" id="6I8PWVHPCMC" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
<node concept="raruj" id="6I8PWVHPCMD" role="lGtFl" />
</node>
</node>
</node>
Expand Down
209 changes: 209 additions & 0 deletions ...s/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<child id="531692237848499024" name="selectorList" index="3LEy0l" />
</concept>
<concept id="4618483580248255217" name="org.iets3.core.expr.collections.structure.UnpackOptionsOp" flags="ng" index="3LGWMD" />
<concept id="6414340278546763815" name="org.iets3.core.expr.collections.structure.AsSingletonList" flags="ng" index="3MhG1o" />
<concept id="7740953487940081584" name="org.iets3.core.expr.collections.structure.MinOp" flags="ng" index="1W43ev" />
<concept id="4931785860342338320" name="org.iets3.core.expr.collections.structure.FoldOp" flags="ng" index="1XzICc">
<child id="4931785860342371144" name="combiner" index="1YsmDk" />
Expand Down Expand Up @@ -20967,5 +20968,213 @@
</node>
</node>
</node>
<node concept="_iOnU" id="6I8PWVHmnyM">
<property role="1XBH2A" value="true" />
<property role="TrG5h" value="HeterogeneousList" />
<node concept="2zPypq" id="6I8PWVHmpap" role="_iOnB">
<property role="TrG5h" value="mixed" />
<property role="0Rz4W" value="1812883394" />
<node concept="3iBYfx" id="6I8PWVHmpaB" role="2lDidJ">
<node concept="2vmpnb" id="6I8PWVHmpaR" role="3iBYfI" />
<node concept="30bXRB" id="6I8PWVHmpb1" role="3iBYfI">
<property role="30bXRw" value="1" />
</node>
<node concept="30bdrP" id="6I8PWVHmpdL" role="3iBYfI">
<property role="30bdrQ" value="two" />
</node>
</node>
</node>
<node concept="_ixoA" id="6I8PWVHmpan" role="_iOnB" />
<node concept="_fkuM" id="6I8PWVHmnyN" role="_iOnB">
<property role="TrG5h" value="mixedAccess" />
<node concept="_fkuZ" id="6I8PWVHmpiM" role="_fkp5">
<node concept="_fku$" id="6I8PWVHmpiN" role="_fkur" />
<node concept="2yLE0X" id="6I8PWVHmpnd" role="_fkuY">
<node concept="30bXRB" id="6I8PWVHmpss" role="2yLE0W">
<property role="30bXRw" value="0" />
</node>
<node concept="_emDc" id="6I8PWVHmpiU" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
</node>
<node concept="2vmpnb" id="6I8PWVHmpxz" role="_fkuS" />
</node>
<node concept="_fkuZ" id="6I8PWVHmpxE" role="_fkp5">
<node concept="_fku$" id="6I8PWVHmpxF" role="_fkur" />
<node concept="2yLE0X" id="6I8PWVHmpxG" role="_fkuY">
<node concept="30bXRB" id="6I8PWVHmpxH" role="2yLE0W">
<property role="30bXRw" value="1" />
</node>
<node concept="_emDc" id="6I8PWVHmpxI" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
</node>
<node concept="30bXRB" id="6I8PWVHmqRd" role="_fkuS">
<property role="30bXRw" value="1" />
</node>
</node>
<node concept="_fkuZ" id="6I8PWVHmp$i" role="_fkp5">
<node concept="_fku$" id="6I8PWVHmp$j" role="_fkur" />
<node concept="2yLE0X" id="6I8PWVHmp$k" role="_fkuY">
<node concept="30bXRB" id="6I8PWVHmp$l" role="2yLE0W">
<property role="30bXRw" value="2" />
</node>
<node concept="_emDc" id="6I8PWVHmp$m" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
</node>
<node concept="30bdrP" id="6I8PWVHmqRs" role="_fkuS">
<property role="30bdrQ" value="two" />
</node>
</node>
<node concept="_fkuZ" id="6I8PWVHmpUS" role="_fkp5">
<node concept="_fku$" id="6I8PWVHmpUT" role="_fkur" />
<node concept="1QScDb" id="6I8PWVHmqo8" role="_fkuY">
<node concept="3iB8M5" id="6I8PWVHmqEP" role="1QScD9" />
<node concept="_emDc" id="6I8PWVHmpUW" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
</node>
<node concept="30bXRB" id="6I8PWVHmqQW" role="_fkuS">
<property role="30bXRw" value="3" />
</node>
</node>
<node concept="_fkuZ" id="7S$8fqQscOa" role="_fkp5">
<node concept="_fku$" id="7S$8fqQscOb" role="_fkur" />
<node concept="1QScDb" id="7S$8fqQsd5l" role="_fkuY">
<node concept="2TZ5KL" id="7S$8fqQsdqg" role="1QScD9">
<node concept="3izI60" id="7S$8fqQsdqh" role="2lDidJ">
<node concept="30cPrO" id="7S$8fqQC$ZT" role="2lDidJ">
<node concept="30bXRB" id="7S$8fqQC_Pv" role="30dEs_">
<property role="30bXRw" value="1" />
</node>
<node concept="1QScDb" id="7S$8fqQCzdX" role="30dEsF">
<node concept="3iB8M5" id="7S$8fqQC$4Y" role="1QScD9" />
<node concept="1QScDb" id="7S$8fqQsdKf" role="2lDidJ">
<node concept="3MhG1o" id="7S$8fqQCyhR" role="1QScD9" />
<node concept="3izPEI" id="7S$8fqQsdqj" role="2lDidJ" />
</node>
</node>
</node>
</node>
</node>
<node concept="_emDc" id="7S$8fqQscOs" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
</node>
<node concept="2vmpnb" id="7S$8fqQselt" role="_fkuS" />
</node>
<node concept="_fkuZ" id="7S$8fqQseEY" role="_fkp5">
<node concept="_fku$" id="7S$8fqQseEZ" role="_fkur" />
<node concept="1QScDb" id="7S$8fqQseJs" role="_fkuY">
<node concept="2Tz0gS" id="7S$8fqQsfd2" role="1QScD9">
<node concept="3izI60" id="7S$8fqQsfd3" role="2lDidJ">
<node concept="30cPrO" id="7S$8fqQCEAZ" role="2lDidJ">
<node concept="30bXRB" id="7S$8fqQCFwT" role="30dEs_">
<property role="30bXRw" value="1" />
</node>
<node concept="1QScDb" id="7S$8fqQCCF8" role="30dEsF">
<node concept="3iB8M5" id="7S$8fqQCDBE" role="1QScD9" />
<node concept="1QScDb" id="7S$8fqQsfSs" role="2lDidJ">
<node concept="3izPEI" id="7S$8fqQsfd5" role="2lDidJ" />
<node concept="3MhG1o" id="7S$8fqQCBAv" role="1QScD9" />
</node>
</node>
</node>
</node>
</node>
<node concept="_emDc" id="7S$8fqQseF9" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
</node>
<node concept="2vmpnb" id="7S$8fqQsgIZ" role="_fkuS" />
</node>
<node concept="_fkuZ" id="7S$8fqQshdf" role="_fkp5">
<node concept="_fku$" id="7S$8fqQshdg" role="_fkur" />
<node concept="1QScDb" id="7S$8fqQshhO" role="_fkuY">
<node concept="2TI7Wt" id="7S$8fqQshS7" role="1QScD9">
<node concept="2vmpnb" id="7S$8fqQsiqu" role="2lDidJ" />
</node>
<node concept="_emDc" id="7S$8fqQshdx" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
</node>
<node concept="2vmpnb" id="7S$8fqQsjsA" role="_fkuS" />
</node>
<node concept="_fkuZ" id="7S$8fqQsjY4" role="_fkp5">
<node concept="_fku$" id="7S$8fqQsjY5" role="_fkur" />
<node concept="1QScDb" id="7S$8fqQsk$3" role="_fkuY">
<node concept="_emDc" id="7S$8fqQsjYm" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
<node concept="3iB7TU" id="7S$8fqQst6s" role="1QScD9" />
</node>
<node concept="2vmpnb" id="7S$8fqQstGt" role="_fkuS" />
</node>
<node concept="_fkuZ" id="7S$8fqQsuik" role="_fkp5">
<node concept="_fku$" id="7S$8fqQsuil" role="_fkur" />
<node concept="1QScDb" id="7S$8fqQsuim" role="_fkuY">
<node concept="_emDc" id="7S$8fqQsuin" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
<node concept="3iB7bo" id="7S$8fqQsv09" role="1QScD9" />
</node>
<node concept="30bdrP" id="7S$8fqQsvF3" role="_fkuS">
<property role="30bdrQ" value="two" />
</node>
</node>
<node concept="_fkuZ" id="7S$8fqQsyov" role="_fkp5">
<node concept="_fku$" id="7S$8fqQsyow" role="_fkur" />
<node concept="1QScDb" id="7S$8fqQsz7T" role="_fkuY">
<node concept="2_758P" id="7S$8fqQszVD" role="1QScD9">
<node concept="30bXRB" id="7S$8fqQs$CE" role="2lDidJ">
<property role="30bXRw" value="1" />
</node>
</node>
<node concept="_emDc" id="7S$8fqQsz3A" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
</node>
<node concept="30bXRB" id="7S$8fqQsA3t" role="_fkuS">
<property role="30bXRw" value="1" />
</node>
</node>
<node concept="_fkuZ" id="7S$8fqQsBuq" role="_fkp5">
<node concept="_fku$" id="7S$8fqQsBur" role="_fkur" />
<node concept="1QScDb" id="7S$8fqQsCfL" role="_fkuY">
<node concept="2DPmsJ" id="7S$8fqQsD5u" role="1QScD9" />
<node concept="_emDc" id="7S$8fqQsCbu" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
</node>
<node concept="3iBYfx" id="7S$8fqQsDQY" role="_fkuS">
<node concept="30bdrP" id="7S$8fqQsDR6" role="3iBYfI">
<property role="30bdrQ" value="two" />
</node>
<node concept="30bXRB" id="7S$8fqQsDSk" role="3iBYfI">
<property role="30bXRw" value="1" />
</node>
<node concept="2vmpnb" id="7S$8fqQsDUi" role="3iBYfI" />
</node>
</node>
<node concept="_fkuZ" id="7S$8fqQsFwQ" role="_fkp5">
<node concept="_fku$" id="7S$8fqQsFwR" role="_fkur" />
<node concept="1QScDb" id="7S$8fqQsGmC" role="_fkuY">
<node concept="2IDqZA" id="7S$8fqQsHgQ" role="1QScD9" />
<node concept="_emDc" id="7S$8fqQsGil" role="2lDidJ">
<ref role="_emDf" node="6I8PWVHmpap" resolve="mixed" />
</node>
</node>
<node concept="3iBYfx" id="7S$8fqQsI9s" role="_fkuS">
<node concept="30bXRB" id="7S$8fqQsI9A" role="3iBYfI">
<property role="30bXRw" value="1" />
</node>
<node concept="30bdrP" id="7S$8fqQsIa2" role="3iBYfI">
<property role="30bdrQ" value="two" />
</node>
</node>
</node>
</node>
</node>
</model>