From 427c3be269b6b6603a5c7befa51744acf17997b8 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Sat, 2 Nov 2024 14:53:00 +0100 Subject: [PATCH] ueb02.2c --- .../controllers/NavigationBetweenViewController.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/fr/enssat/BoulderDash/controllers/NavigationBetweenViewController.java b/src/fr/enssat/BoulderDash/controllers/NavigationBetweenViewController.java index db190f48..184ca96f 100644 --- a/src/fr/enssat/BoulderDash/controllers/NavigationBetweenViewController.java +++ b/src/fr/enssat/BoulderDash/controllers/NavigationBetweenViewController.java @@ -18,9 +18,8 @@ import fr.enssat.BoulderDash.controllers.GameController; public class NavigationBetweenViewController implements ActionListener { private LevelEditorController levelEditorController; private MenuView menuView; - private AudioLoadHelper audioLoadHelper; - private LevelModel levelModelForGame, levelModelForEditor; - private GameController gameController; + private final AudioLoadHelper audioLoadHelper; + private GameController gameController; private String pickedLevelIdentifier; /** @@ -50,8 +49,8 @@ public class NavigationBetweenViewController implements ActionListener { case "editor": // New blank model for editor - this.levelModelForEditor = new LevelModel(audioLoadHelper); - this.levelEditorController = new LevelEditorController(this.levelModelForEditor, this); + LevelModel levelModelForEditor = new LevelModel(audioLoadHelper); + this.levelEditorController = new LevelEditorController(levelModelForEditor, this); this.levelEditorController.getLevelEditorView().setVisible(true); this.levelEditorController.getLevelEditorView().getLevelEditorGroundView().grabFocus(); @@ -66,7 +65,7 @@ public class NavigationBetweenViewController implements ActionListener { // Reinit the levelModelForGame... pickedLevelIdentifier = this.menuView.getLevelIdentifier(); - this.levelModelForGame = new LevelModel(pickedLevelIdentifier, audioLoadHelper); + LevelModel levelModelForGame = new LevelModel(pickedLevelIdentifier, audioLoadHelper); this.gameController = new GameController(levelModelForGame, audioLoadHelper, this); if (levelEditorController != null) {