From 58cd875b7cab88202dad82c8c62826bc9b66e954 Mon Sep 17 00:00:00 2001 From: 0nlineSam Date: Mon, 11 Nov 2024 18:43:46 +0100 Subject: [PATCH] Replaced == with equals method and removed unused parameters --- .../BoulderAndDiamondController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/fr/enssat/BoulderDash/controllers/BoulderAndDiamondController.java b/src/fr/enssat/BoulderDash/controllers/BoulderAndDiamondController.java index 320c0ffb..a3cdd451 100644 --- a/src/fr/enssat/BoulderDash/controllers/BoulderAndDiamondController.java +++ b/src/fr/enssat/BoulderDash/controllers/BoulderAndDiamondController.java @@ -18,7 +18,7 @@ import static fr.enssat.BoulderDash.helpers.AudioLoadHelper.AUDIO_LOAD_HELPER; */ public class BoulderAndDiamondController extends AbstractLevelController implements Runnable { private Thread elementMovingThread; - + /** * Class constructor * @@ -66,9 +66,9 @@ public class BoulderAndDiamondController extends AbstractLevelController impleme String spriteName = elementModel.getSpriteName(); // If it is a boulder or a diamond... - if (spriteName == "boulder" || spriteName == "diamond") { + if ("boulder".equals(spriteName) || "diamond".equals(spriteName)) { this.manageFallingObjectBehavior(x, y); - } else if(spriteName == "expandingwall"){ + } else if("expandingwall".equals(spriteName)){ if(this.expandWall(x,y).equals("left")){ x -= 1; } @@ -91,11 +91,11 @@ public class BoulderAndDiamondController extends AbstractLevelController impleme String spriteNameRight = elementRight.getSpriteName(); String way = ""; - if(spriteNameLeft == "black"){ + if("black".equals(spriteNameLeft)){ this.levelModel.expandThisWallToLeft(x,y); way = "left"; } - if(spriteNameRight == "black"){ + if("black".equals(spriteNameRight)){ this.levelModel.expandThisWallToRight(x,y); way = "right"; } @@ -121,21 +121,21 @@ public class BoulderAndDiamondController extends AbstractLevelController impleme String spriteNameRight = elementRight.getSpriteName(); // Handle different cases based on the element's surroundings - handleFalling(x, y, spriteNameBelow, element); - handleBoulder(x, y, spriteNameBelow, element, elementTwoBelow); + handleFalling(x, y, spriteNameBelow); + handleBoulder(x, y, spriteNameBelow); handleRockfordCollision(x, y, spriteNameBelow, element); handleMagicWall(x, y, spriteNameBelow, element, elementTwoBelow); handleDestructibleWalls(x, y, elementBelow, element); handleRockfordMovement(x, y,element, spriteNameLeft, spriteNameRight, elementLeft, elementRight); } - private void handleFalling(int x, int y, String spriteNameBelow, DisplayableElementModel element) { + private void handleFalling(int x, int y, String spriteNameBelow) { if (spriteNameBelow.equals("black")) { this.levelModel.makeThisDisplayableElementFall(x, y); } } - private void handleBoulder(int x, int y, String spriteNameBelow, DisplayableElementModel element, DisplayableElementModel elementTwoBelow) { + private void handleBoulder(int x, int y, String spriteNameBelow) { if (spriteNameBelow.equals("boulder")) { if (this.levelModel.getElementBelowLeft(x, y).getSpriteName().equals("black")) { this.levelModel.makeThisBoulderSlideLeft(x, y);