From d937090e5f4dff48b6f0e8056c03ac58f2089444 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Tue, 19 Nov 2024 09:51:07 +0100
Subject: [PATCH] 1b: chained constructor with default values

---
 .../models/displayableElement/CursorModel.java   |  5 +----
 .../DisplayableElementModel.java                 | 16 ++++++++++++++--
 .../models/displayableElement/DoorModel.java     |  5 +----
 .../models/displayableElement/EmptyModel.java    |  5 +----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/CursorModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/CursorModel.java
index 00686b4c..4ab26e12 100644
--- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/CursorModel.java
+++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/CursorModel.java
@@ -11,10 +11,7 @@ package fr.enssat.BoulderDash.models.displayableElement;
  */
 public class CursorModel extends DisplayableElementModel {
     CursorModel() {
-        super(false, false, "cursor",
-                0, false, false,
-                false, null);
-
+        super("cursor");
         this.loadSprite("cursor");
     }
 }
\ No newline at end of file
diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java
index 13c0b0a4..5d7d1019 100644
--- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java
+++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DisplayableElementModel.java
@@ -49,7 +49,9 @@ public abstract class DisplayableElementModel {
 	 * @param  impactExplosive  Object explodes on impact?
 	 * @param  animate          Object can be animated?
 	 */
-	public DisplayableElementModel(boolean destructible, boolean moving, String spriteName, int priority, boolean impactExplosive, boolean animate, boolean falling, String collideSound, boolean convertible) {
+	public DisplayableElementModel(boolean destructible, boolean moving, String spriteName, int priority,
+								   boolean impactExplosive, boolean animate, boolean falling, String collideSound,
+								   boolean convertible) {
 		this.moving = moving;
 		this.destructible = destructible;
 		this.spriteName = spriteName;
@@ -63,10 +65,20 @@ public abstract class DisplayableElementModel {
 
     public DisplayableElementModel(boolean destructible, boolean moving, String spriteName, int priority, boolean impactExplosive, boolean animate, boolean falling, String collideSound) {
         this(
-                destructible, moving, spriteName, priority, impactExplosive, animate, falling, collideSound, false
+                destructible, moving, spriteName,
+				priority, impactExplosive, animate,
+				falling, collideSound, false
         );
     }
 
+	public DisplayableElementModel(final String spriteName){
+		this(
+				false, false, spriteName,
+				0, false, false,
+				false, null
+		);
+	}
+
 	public static BoulderModel newBoulderModel() {
 		return DisplayableElementModel.newBoulderModel(false);
 	}
diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DoorModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DoorModel.java
index 8a0834e0..bc01a5d3 100644
--- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DoorModel.java
+++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/DoorModel.java
@@ -11,10 +11,7 @@ package fr.enssat.BoulderDash.models.displayableElement;
  */
 public class DoorModel extends DisplayableElementModel {
 	DoorModel() {
-		super(false, false, "door",
-				0, false, false,
-				false, null);
-
+		super("door");
 		this.loadSprite("door");
 	}
 }
diff --git a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/EmptyModel.java b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/EmptyModel.java
index 9377dd64..f89ea3cd 100644
--- a/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/EmptyModel.java
+++ b/boulder-dash/src/fr/enssat/BoulderDash/models/displayableElement/EmptyModel.java
@@ -11,10 +11,7 @@ package fr.enssat.BoulderDash.models.displayableElement;
  */
 public class EmptyModel extends DisplayableElementModel {
     EmptyModel() {
-		super(false, false, "black",
-				0, false, false,
-				false, null);
-
+		super("black");
 		this.loadSprite("black");
 	}
 }