langfingaz/SoftwareQuality
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Replaced == with equals method and removed unused parameters

Browse Source
This commit is contained in:
0nlineSam 2024-11-11 18:43:46 +01:00
parent 8fc59ef134
commit 58cd875b7c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/fr/enssat/BoulderDash/controllers/BoulderAndDiamondController.java
View File

@ -18,7 +18,7 @@ import static fr.enssat.BoulderDash.helpers.AudioLoadHelper.AUDIO_LOAD_HELPER;
*/ */
public class BoulderAndDiamondController extends AbstractLevelController implements Runnable { public class BoulderAndDiamondController extends AbstractLevelController implements Runnable {
private Thread elementMovingThread; private Thread elementMovingThread;
/** /**
* Class constructor * Class constructor
* *
@ -66,9 +66,9 @@ public class BoulderAndDiamondController extends AbstractLevelController impleme
String spriteName = elementModel.getSpriteName(); String spriteName = elementModel.getSpriteName();
// If it is a boulder or a diamond... // If it is a boulder or a diamond...
if (spriteName == "boulder" || spriteName == "diamond") { if ("boulder".equals(spriteName) || "diamond".equals(spriteName)) {
this.manageFallingObjectBehavior(x, y); this.manageFallingObjectBehavior(x, y);
} else if(spriteName == "expandingwall"){ } else if("expandingwall".equals(spriteName)){
if(this.expandWall(x,y).equals("left")){ if(this.expandWall(x,y).equals("left")){
x -= 1; x -= 1;
} }
@ -91,11 +91,11 @@ public class BoulderAndDiamondController extends AbstractLevelController impleme
String spriteNameRight = elementRight.getSpriteName(); String spriteNameRight = elementRight.getSpriteName();
String way = ""; String way = "";
if(spriteNameLeft == "black"){ if("black".equals(spriteNameLeft)){
this.levelModel.expandThisWallToLeft(x,y); this.levelModel.expandThisWallToLeft(x,y);
way = "left"; way = "left";
} }
if(spriteNameRight == "black"){ if("black".equals(spriteNameRight)){
this.levelModel.expandThisWallToRight(x,y); this.levelModel.expandThisWallToRight(x,y);
way = "right"; way = "right";
} }
@ -121,21 +121,21 @@ public class BoulderAndDiamondController extends AbstractLevelController impleme
String spriteNameRight = elementRight.getSpriteName(); String spriteNameRight = elementRight.getSpriteName();
// Handle different cases based on the element's surroundings // Handle different cases based on the element's surroundings
handleFalling(x, y, spriteNameBelow, element); handleFalling(x, y, spriteNameBelow);
handleBoulder(x, y, spriteNameBelow, element, elementTwoBelow); handleBoulder(x, y, spriteNameBelow);
handleRockfordCollision(x, y, spriteNameBelow, element); handleRockfordCollision(x, y, spriteNameBelow, element);
handleMagicWall(x, y, spriteNameBelow, element, elementTwoBelow); handleMagicWall(x, y, spriteNameBelow, element, elementTwoBelow);
handleDestructibleWalls(x, y, elementBelow, element); handleDestructibleWalls(x, y, elementBelow, element);
handleRockfordMovement(x, y,element, spriteNameLeft, spriteNameRight, elementLeft, elementRight); 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")) { if (spriteNameBelow.equals("black")) {
this.levelModel.makeThisDisplayableElementFall(x, y); 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 (spriteNameBelow.equals("boulder")) {
if (this.levelModel.getElementBelowLeft(x, y).getSpriteName().equals("black")) { if (this.levelModel.getElementBelowLeft(x, y).getSpriteName().equals("black")) {
this.levelModel.makeThisBoulderSlideLeft(x, y); this.levelModel.makeThisBoulderSlideLeft(x, y);