Refac builder

armin-reichert · armin-reichert · commit f24a9b3f2a9e · 2025-08-09T08:00:15.000+02:00
diff --git a/doc/linux-issues.md b/doc/linux-issues.md
@@ -166,7 +166,7 @@ Ok, so try this:
 In IntelliJ, right-click over the "Main" class of the 3d subproject and select "More Run/Debug -> Modify Run
 Configuration..."
 
-In the run configuration, add the VM parameters input field and enter `-Dprism.verbose=true -Dprism.forceGPU=true`.
+In the run gameConfiguration, add the VM parameters input field and enter `-Dprism.verbose=true -Dprism.forceGPU=true`.
 Then run the application. And, you won't believe what you see in the console:
 
 ```
diff --git a/pacman-app-allgames/src/main/java/de/amr/pacmanfx/allgames/app/PacManGames3dApp.java b/pacman-app-allgames/src/main/java/de/amr/pacmanfx/allgames/app/PacManGames3dApp.java
@@ -50,10 +50,10 @@ public void start(Stage primaryStage) {
             .game(GameVariant.MS_PACMAN_XXL.name(),
                 PacManXXL_MsPacMan_GameModel.class, mapSelectorXXL, PacManXXL_MsPacMan_UIConfig.class)
             // start pages are added to carousel in this order:
-            .startPage(GameVariant.PACMAN.name(), ArcadePacMan_StartPage.class)
-            .startPage(GameVariant.MS_PACMAN.name(), ArcadeMsPacMan_StartPage.class)
-            .startPage(GameVariant.MS_PACMAN_TENGEN.name(), TengenMsPacMan_StartPage.class)
-            .startPage(GameVariant.PACMAN_XXL.name(), PacManXXL_Common_StartPage.class) // MS_PACMAN_XXL uses this too
+            .startPage(ArcadePacMan_StartPage.class, GameVariant.PACMAN.name())
+            .startPage(ArcadeMsPacMan_StartPage.class, GameVariant.MS_PACMAN.name())
+            .startPage(TengenMsPacMan_StartPage.class, GameVariant.MS_PACMAN_TENGEN.name())
+            .startPage(PacManXXL_Common_StartPage.class, GameVariant.PACMAN_XXL.name(), GameVariant.MS_PACMAN_XXL.name())
             .dashboard(
                 DashboardID.GENERAL, DashboardID.GAME_CONTROL,
                 DashboardID.SETTINGS_3D,
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_App.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_App.java
@@ -28,7 +28,7 @@ public void start(Stage primaryStage) {
                 ArcadeMsPacMan_GameModel.class,
                 ArcadeMsPacMan_UIConfig.class
             )
-            .startPage(GAME_VARIANT, ArcadeMsPacMan_StartPage.class)
+            .startPage(ArcadeMsPacMan_StartPage.class, GAME_VARIANT)
             .dashboard(
                 DashboardID.GENERAL, DashboardID.GAME_CONTROL,
                 DashboardID.SETTINGS_3D,
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/app/ArcadePacMan_App.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/app/ArcadePacMan_App.java
@@ -18,7 +18,7 @@
 
 public class ArcadePacMan_App extends Application {
 
-    private static final String GAME_VARIANT = GameVariant.PACMAN.name();
+    private static final String GAME_VARIANT_NAME = GameVariant.PACMAN.name();
 
     @Override
     public void start(Stage primaryStage) {
@@ -27,11 +27,11 @@ public void start(Stage primaryStage) {
         final double width  = 1.2 * height;
         GameUI_Builder.createUI(primaryStage, width, height)
             .game(
-                GAME_VARIANT,
+                GAME_VARIANT_NAME,
                 ArcadePacMan_GameModel.class,
                 ArcadePacMan_UIConfig.class
             )
-            .startPage(GAME_VARIANT, ArcadePacMan_StartPage.class)
+            .startPage(ArcadePacMan_StartPage.class, GAME_VARIANT_NAME)
             .dashboard(
                 DashboardID.GENERAL, DashboardID.GAME_CONTROL,
                 DashboardID.SETTINGS_3D,
diff --git a/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_Common_App.java b/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_Common_App.java
@@ -43,7 +43,7 @@ public void start(Stage primaryStage) {
                     DashboardID.KEYBOARD_SHORTCUTS_GLOBAL, DashboardID.KEYBOARD_SHORTCUTS_LOCAL,
                     DashboardID.ABOUT
                 )
-            .startPage(PACMAN_XXL.name(),PacManXXL_Common_StartPage.class)
+            .startPage(PacManXXL_Common_StartPage.class, PACMAN_XXL.name())
             .build()
             .show();
 
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/app/TengenMsPacMan_App.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/app/TengenMsPacMan_App.java
@@ -19,7 +19,7 @@
 
 public class TengenMsPacMan_App extends Application {
 
-    private static final String GAME_VARIANT = MS_PACMAN_TENGEN.name();
+    private static final String GAME_VARIANT_NAME = MS_PACMAN_TENGEN.name();
 
     @Override
     public void start(Stage primaryStage) {
@@ -28,11 +28,11 @@ public void start(Stage primaryStage) {
         final double width  = NES_ASPECT * height;
         GameUI_Builder.createUI(primaryStage, width, height)
             .game(
-                GAME_VARIANT,
+                GAME_VARIANT_NAME,
                 TengenMsPacMan_GameModel.class,
                 TengenMsPacMan_UIConfig.class
             )
-            .startPage(GAME_VARIANT, TengenMsPacMan_StartPage.class)
+            .startPage(TengenMsPacMan_StartPage.class, GAME_VARIANT_NAME)
             .dashboard(
                 DashboardID.GENERAL, DashboardID.GAME_CONTROL,
                 DashboardID.SETTINGS_3D,
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/GameUI_Builder.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/GameUI_Builder.java
@@ -14,18 +14,19 @@
 import javafx.stage.Stage;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class GameUI_Builder {
 
-    private static class Configuration {
+    private static class GameConfiguration {
         Class<?> gameModelClass;
-        MapSelector mapSelector;
         Class<?> uiConfigClass;
+        MapSelector mapSelector;
+    }
+
+    private static class StartPageConfiguration {
         Class<?> startPageClass;
+        List<String> gameVariants;
     }
 
     public static GameUI_Builder createUI(Stage stage, double width, double height) {
@@ -34,16 +35,17 @@ public static GameUI_Builder createUI(Stage stage, double width, double height)
     }
 
     private final PacManGames_UI_Impl ui;
-    private final Map<String, Configuration> configurationByGameVariant = new LinkedHashMap<>();
+    private final Map<String, GameConfiguration> configurationByGameVariant = new LinkedHashMap<>();
+    private final List<StartPageConfiguration> startPageConfigs = new ArrayList<>();
     private List<DashboardID> dashboardIDs = List.of();
 
     private GameUI_Builder(PacManGames_UI_Impl ui) {
         this.ui = ui;
     }
 
-    private Configuration configuration(String gameVariant) {
+    private GameConfiguration configuration(String gameVariant) {
         if (!configurationByGameVariant.containsKey(gameVariant)) {
-            configurationByGameVariant.put(gameVariant, new Configuration());
+            configurationByGameVariant.put(gameVariant, new GameConfiguration());
         }
         return configurationByGameVariant.get(gameVariant);
     }
@@ -87,21 +89,17 @@ public GameUI_Builder game(
         return this;
     }
 
-    public GameUI_Builder startPage(String gameVariant, Class<?> startPageClass) {
+    public GameUI_Builder startPage(Class<?> startPageClass, String... gameVariants) {
         if (startPageClass == null) {
             error("Start page class must not be null");
         }
-        configuration(gameVariant).startPageClass = startPageClass;
-        return this;
-    }
-
-    public GameUI_Builder startPageShared(String gameVariant, String otherGameVariant) {
-        Class<?> sharedStartPageClass = configuration(otherGameVariant).startPageClass;
-        if (sharedStartPageClass == null) {
-            error("Shared start page not found. Must define start page of shared game variant first!");
-            throw new IllegalStateException();
+        if (gameVariants == null) {
+            error("Game variants list must not be null");
         }
-        configuration(gameVariant).startPageClass = sharedStartPageClass;
+        var config = new StartPageConfiguration();
+        config.startPageClass = startPageClass;
+        config.gameVariants = List.of(gameVariants);
+        startPageConfigs.add(config);
         return this;
     }
 
@@ -116,21 +114,22 @@ public GameUI_Builder dashboard(DashboardID... dashboardIDs) {
     public GameUI build() {
         validateConfiguration();
         configurationByGameVariant.keySet().forEach(gameVariant -> {
-            Configuration configuration = configuration(gameVariant);
+            GameConfiguration gameConfiguration = configuration(gameVariant);
             GameModel gameModel = createGameModel(
-                configuration.gameModelClass,
-                configuration.mapSelector,
+                gameConfiguration.gameModelClass,
+                gameConfiguration.mapSelector,
                 ui.theGameContext(),
                 highScoreFile(ui.theGameContext().theHomeDir(), gameVariant)
             );
             gameModel.init();
             ui.theGameContext().theGameController().registerGame(gameVariant, gameModel);
-            ui.applyConfiguration(gameVariant, configuration.uiConfigClass);
-            if (configuration.startPageClass != null) {
-                StartPage startPage = createStartPage(gameVariant, configuration.startPageClass);
-                ui.theStartPagesView().addStartPage(startPage);
-            }
+            ui.applyConfiguration(gameVariant, gameConfiguration.uiConfigClass);
         });
+        for (StartPageConfiguration config : startPageConfigs) {
+            StartPage startPage = createStartPage(config.gameVariants.getFirst(), config.startPageClass);
+            ui.theStartPagesView().addStartPage(startPage);
+
+        }
         ui.thePlayView().dashboard().configure(dashboardIDs);
 
         ui.theStartPagesView().selectStartPage(0);

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void start(Stage primaryStage) {`
`28`	`28`	`ArcadeMsPacMan_GameModel.class,`
`29`	`29`	`ArcadeMsPacMan_UIConfig.class`
`30`	`30`	`)`
`31`		`- .startPage(GAME_VARIANT, ArcadeMsPacMan_StartPage.class)`
	`31`	`+ .startPage(ArcadeMsPacMan_StartPage.class, GAME_VARIANT)`
`32`	`32`	`.dashboard(`
`33`	`33`	`DashboardID.GENERAL, DashboardID.GAME_CONTROL,`
`34`	`34`	`DashboardID.SETTINGS_3D,`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public void start(Stage primaryStage) {`
`43`	`43`	`DashboardID.KEYBOARD_SHORTCUTS_GLOBAL, DashboardID.KEYBOARD_SHORTCUTS_LOCAL,`
`44`	`44`	`DashboardID.ABOUT`
`45`	`45`	`)`
`46`		`- .startPage(PACMAN_XXL.name(),PacManXXL_Common_StartPage.class)`
	`46`	`+ .startPage(PacManXXL_Common_StartPage.class, PACMAN_XXL.name())`
`47`	`47`	`.build()`
`48`	`48`	`.show();`
`49`	`49`