From 26b40ec1208407ed17dacd7a1a96655488ad53d2 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 22 Dec 2025 08:48:24 +0100 Subject: [PATCH 1/3] fix(genjava.base): use Object for heterogeneous lists for the join type --- ...iets3.core.expr.genjava.base@generator.mps | 33 +-- .../test.in.expr.os.collections@tests.mps | 209 ++++++++++++++++++ 2 files changed, 220 insertions(+), 22 deletions(-) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps index d269ae00c2..cae3d877e8 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps @@ -17093,32 +17093,21 @@ - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.collections@tests.mps b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.collections@tests.mps index 205a4c169e..08f79d62bd 100644 --- a/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.collections@tests.mps +++ b/code/languages/org.iets3.opensource/tests/test.in.expr.os/models/test.in.expr.os.collections@tests.mps @@ -101,6 +101,7 @@ + @@ -20967,5 +20968,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3ce7294684c7f47c26b7abfd228cb84ab8c20f6f Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 22 Dec 2025 08:48:59 +0100 Subject: [PATCH 2/3] feature(genjava): add a generator for the empty type --- ...iets3.core.expr.genjava.base@generator.mps | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps index cae3d877e8..0c720fc140 100644 --- a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps +++ b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/generator/template/org.iets3.core.expr.genjava.base@generator.mps @@ -17115,6 +17115,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From 7a0e4b5c87565e08a3ff8301cea7bda83ac86ed8 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 22 Dec 2025 08:50:11 +0100 Subject: [PATCH 3/3] update the changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f993dcded9..58360d1ac3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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