Improve naming

Arun Prasaad · Arun Prasaad · commit 29d0d85a1ce4 · 2025-09-28T15:17:15.000+01:00
diff --git a/src/main/java/logic/Cell.java b/src/main/java/logic/Cell.java
@@ -24,16 +24,16 @@ public void setTileType(TileType tileType) {
     	this.tileType = tileType;
     }
 
-    public void setAdjacentCellContent(Direction direction, TileType content) {
+    public void setAdjacentCellType(Direction direction, TileType type) {
         switch (direction) {
-            case UP    -> warehouse.getCell(line - 1, column).setTileType(content);
-            case DOWN  -> warehouse.getCell(line + 1, column).setTileType(content);
-            case LEFT  -> warehouse.getCell(line, column - 1).setTileType(content);
-            case RIGHT -> warehouse.getCell(line, column + 1).setTileType(content);
+            case UP    -> warehouse.getCell(line - 1, column).setTileType(type);
+            case DOWN  -> warehouse.getCell(line + 1, column).setTileType(type);
+            case LEFT  -> warehouse.getCell(line, column - 1).setTileType(type);
+            case RIGHT -> warehouse.getCell(line, column + 1).setTileType(type);
         }
     }
 
-    public TileType getAdjacentCellContent(Direction direction) {
+    public TileType getAdjacentCellType(Direction direction) {
         return switch (direction) {
             case UP    -> warehouse.getCell(line - 1, column).getTileType();
             case DOWN  -> warehouse.getCell(line + 1, column).getTileType();
@@ -51,17 +51,17 @@ public boolean canAcceptWorker(Direction direction) {
                 if (boxCellCannotAcceptWorker(direction)) {
                     return false;
                 }
-                switch (this.getAdjacentCellContent(direction)) {
+                switch (this.getAdjacentCellType(direction)) {
                     case UNSTORED_BOX, STORED_BOX, WALL, OUTSIDE -> {
                         return false;
                     }
                     case STORAGE_AREA -> {
                         this.setTileType(TileType.WORKER_ON_FLOOR);
-                        this.setAdjacentCellContent(direction, TileType.STORED_BOX);
+                        this.setAdjacentCellType(direction, TileType.STORED_BOX);
                     }
                     case FLOOR -> {
                         this.setTileType(TileType.WORKER_ON_FLOOR);
-                        this.setAdjacentCellContent(direction, TileType.UNSTORED_BOX);
+                        this.setAdjacentCellType(direction, TileType.UNSTORED_BOX);
                     }
                     default -> {
                     }
@@ -71,17 +71,17 @@ public boolean canAcceptWorker(Direction direction) {
                 if (boxCellCannotAcceptWorker(direction)) {
                     return false;
                 }
-                switch (this.getAdjacentCellContent(direction)) {
+                switch (this.getAdjacentCellType(direction)) {
                     case UNSTORED_BOX, WALL, STORED_BOX -> {
                         return false;
                     }
                     case STORAGE_AREA -> {
                         this.setTileType(TileType.WORKER_IN_STORAGE_AREA);
-                        this.setAdjacentCellContent(direction, TileType.STORED_BOX);
+                        this.setAdjacentCellType(direction, TileType.STORED_BOX);
                     }
                     case FLOOR -> {
                         this.setTileType(TileType.WORKER_IN_STORAGE_AREA);
-                        this.setAdjacentCellContent(direction, TileType.UNSTORED_BOX);
+                        this.setAdjacentCellType(direction, TileType.UNSTORED_BOX);
                     }
                     default -> {
                     }
@@ -93,13 +93,13 @@ public boolean canAcceptWorker(Direction direction) {
             }
         }
     	Direction previous_player = direction.reverse();
-        return switch (this.getAdjacentCellContent(previous_player)) {
+        return switch (this.getAdjacentCellType(previous_player)) {
             case WORKER_ON_FLOOR -> {
-                this.setAdjacentCellContent(previous_player, TileType.FLOOR);
+                this.setAdjacentCellType(previous_player, TileType.FLOOR);
                 yield true;
             }
             case WORKER_IN_STORAGE_AREA -> {
-                this.setAdjacentCellContent(previous_player, TileType.STORAGE_AREA);
+                this.setAdjacentCellType(previous_player, TileType.STORAGE_AREA);
                 yield true;
             }
             default -> false;

Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,16 @@ public void setTileType(TileType tileType) {`
`24`	`24`	`this.tileType = tileType;`
`25`	`25`	`}`
`26`	`26`
`27`		`- public void setAdjacentCellContent(Direction direction, TileType content) {`
	`27`	`+ public void setAdjacentCellType(Direction direction, TileType type) {`
`28`	`28`	`switch (direction) {`
`29`		`- case UP -> warehouse.getCell(line - 1, column).setTileType(content);`
`30`		`- case DOWN -> warehouse.getCell(line + 1, column).setTileType(content);`
`31`		`- case LEFT -> warehouse.getCell(line, column - 1).setTileType(content);`
`32`		`- case RIGHT -> warehouse.getCell(line, column + 1).setTileType(content);`
	`29`	`+ case UP -> warehouse.getCell(line - 1, column).setTileType(type);`
	`30`	`+ case DOWN -> warehouse.getCell(line + 1, column).setTileType(type);`
	`31`	`+ case LEFT -> warehouse.getCell(line, column - 1).setTileType(type);`
	`32`	`+ case RIGHT -> warehouse.getCell(line, column + 1).setTileType(type);`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- public TileType getAdjacentCellContent(Direction direction) {`
	`36`	`+ public TileType getAdjacentCellType(Direction direction) {`
`37`	`37`	`return switch (direction) {`
`38`	`38`	`case UP -> warehouse.getCell(line - 1, column).getTileType();`
`39`	`39`	`case DOWN -> warehouse.getCell(line + 1, column).getTileType();`
`@@ -51,17 +51,17 @@ public boolean canAcceptWorker(Direction direction) {`
`51`	`51`	`if (boxCellCannotAcceptWorker(direction)) {`
`52`	`52`	`return false;`
`53`	`53`	`}`
`54`		`- switch (this.getAdjacentCellContent(direction)) {`
	`54`	`+ switch (this.getAdjacentCellType(direction)) {`
`55`	`55`	`case UNSTORED_BOX, STORED_BOX, WALL, OUTSIDE -> {`
`56`	`56`	`return false;`
`57`	`57`	`}`
`58`	`58`	`case STORAGE_AREA -> {`
`59`	`59`	`this.setTileType(TileType.WORKER_ON_FLOOR);`
`60`		`- this.setAdjacentCellContent(direction, TileType.STORED_BOX);`
	`60`	`+ this.setAdjacentCellType(direction, TileType.STORED_BOX);`
`61`	`61`	`}`
`62`	`62`	`case FLOOR -> {`
`63`	`63`	`this.setTileType(TileType.WORKER_ON_FLOOR);`
`64`		`- this.setAdjacentCellContent(direction, TileType.UNSTORED_BOX);`
	`64`	`+ this.setAdjacentCellType(direction, TileType.UNSTORED_BOX);`
`65`	`65`	`}`
`66`	`66`	`default -> {`
`67`	`67`	`}`
`@@ -71,17 +71,17 @@ public boolean canAcceptWorker(Direction direction) {`
`71`	`71`	`if (boxCellCannotAcceptWorker(direction)) {`
`72`	`72`	`return false;`
`73`	`73`	`}`
`74`		`- switch (this.getAdjacentCellContent(direction)) {`
	`74`	`+ switch (this.getAdjacentCellType(direction)) {`
`75`	`75`	`case UNSTORED_BOX, WALL, STORED_BOX -> {`
`76`	`76`	`return false;`
`77`	`77`	`}`
`78`	`78`	`case STORAGE_AREA -> {`
`79`	`79`	`this.setTileType(TileType.WORKER_IN_STORAGE_AREA);`
`80`		`- this.setAdjacentCellContent(direction, TileType.STORED_BOX);`
	`80`	`+ this.setAdjacentCellType(direction, TileType.STORED_BOX);`
`81`	`81`	`}`
`82`	`82`	`case FLOOR -> {`
`83`	`83`	`this.setTileType(TileType.WORKER_IN_STORAGE_AREA);`
`84`		`- this.setAdjacentCellContent(direction, TileType.UNSTORED_BOX);`
	`84`	`+ this.setAdjacentCellType(direction, TileType.UNSTORED_BOX);`
`85`	`85`	`}`
`86`	`86`	`default -> {`
`87`	`87`	`}`
`@@ -93,13 +93,13 @@ public boolean canAcceptWorker(Direction direction) {`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`Direction previous_player = direction.reverse();`
`96`		`- return switch (this.getAdjacentCellContent(previous_player)) {`
	`96`	`+ return switch (this.getAdjacentCellType(previous_player)) {`
`97`	`97`	`case WORKER_ON_FLOOR -> {`
`98`		`- this.setAdjacentCellContent(previous_player, TileType.FLOOR);`
	`98`	`+ this.setAdjacentCellType(previous_player, TileType.FLOOR);`
`99`	`99`	`yield true;`
`100`	`100`	`}`
`101`	`101`	`case WORKER_IN_STORAGE_AREA -> {`
`102`		`- this.setAdjacentCellContent(previous_player, TileType.STORAGE_AREA);`
	`102`	`+ this.setAdjacentCellType(previous_player, TileType.STORAGE_AREA);`
`103`	`103`	`yield true;`
`104`	`104`	`}`
`105`	`105`	`default -> false;`