-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Automated Java code formatting changes
- Loading branch information
Showing
54 changed files
with
1,203 additions
and
1,193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 64 additions & 67 deletions
131
src/main/java/edu/rpi/legup/puzzle/minesweeper/Minesweeper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,64 @@ | ||
| package edu.rpi.legup.puzzle.minesweeper; | ||
|
|
||
| import edu.rpi.legup.model.Puzzle; | ||
| import edu.rpi.legup.model.gameboard.Board; | ||
| import edu.rpi.legup.model.gameboard.PuzzleElement; | ||
| import edu.rpi.legup.model.rules.ContradictionRule; | ||
| import org.jetbrains.annotations.Contract; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| public class Minesweeper extends Puzzle { | ||
|
|
||
| public static final String NAME = "Minesweeper"; | ||
|
|
||
| public Minesweeper() { | ||
| this.name = NAME; | ||
| this.importer = new MinesweeperImporter(this); | ||
| this.exporter = new MinesweeperExporter(this); | ||
| this.factory = MinesweeperCellFactory.INSTANCE; | ||
| } | ||
|
|
||
| @Override | ||
| @Contract(pure = false) | ||
| public void initializeView() { | ||
| this.boardView = new MinesweeperView((MinesweeperBoard) this.currentBoard); | ||
| this.boardView.setBoard(this.currentBoard); | ||
| addBoardListener(boardView); | ||
| } | ||
|
|
||
| @Override | ||
| @Contract("_ -> null") | ||
| public @Nullable Board generatePuzzle(int difficulty) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| @Contract(pure = true) | ||
| public boolean isBoardComplete(@NotNull Board board) { | ||
| MinesweeperBoard minesweeperBoard = (MinesweeperBoard) board; | ||
|
|
||
| for (ContradictionRule rule : contradictionRules) { | ||
| if (rule.checkContradiction(minesweeperBoard) == null) { | ||
| return false; | ||
| } | ||
| } | ||
| for (PuzzleElement<?> data : minesweeperBoard.getPuzzleElements()) { | ||
| final MinesweeperCell cell = (MinesweeperCell) data; | ||
| if (cell.getData().equals(MinesweeperTileData.empty())) { | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| @Contract(pure = true) | ||
| public void onBoardChange(@NotNull Board board) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| @Contract(pure = true) | ||
| public boolean isValidDimensions(int rows, int columns) { | ||
| return rows >= 1 && columns >= 1; | ||
| } | ||
|
|
||
| } | ||
| package edu.rpi.legup.puzzle.minesweeper; | ||
|
|
||
| import edu.rpi.legup.model.Puzzle; | ||
| import edu.rpi.legup.model.gameboard.Board; | ||
| import edu.rpi.legup.model.gameboard.PuzzleElement; | ||
| import edu.rpi.legup.model.rules.ContradictionRule; | ||
| import org.jetbrains.annotations.Contract; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| public class Minesweeper extends Puzzle { | ||
|
|
||
| public static final String NAME = "Minesweeper"; | ||
|
|
||
| public Minesweeper() { | ||
| this.name = NAME; | ||
| this.importer = new MinesweeperImporter(this); | ||
| this.exporter = new MinesweeperExporter(this); | ||
| this.factory = MinesweeperCellFactory.INSTANCE; | ||
| } | ||
|
|
||
| @Override | ||
| @Contract(pure = false) | ||
| public void initializeView() { | ||
| this.boardView = new MinesweeperView((MinesweeperBoard) this.currentBoard); | ||
| this.boardView.setBoard(this.currentBoard); | ||
| addBoardListener(boardView); | ||
| } | ||
|
|
||
| @Override | ||
| @Contract("_ -> null") | ||
| public @Nullable Board generatePuzzle(int difficulty) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| @Contract(pure = true) | ||
| public boolean isBoardComplete(@NotNull Board board) { | ||
| MinesweeperBoard minesweeperBoard = (MinesweeperBoard) board; | ||
|
|
||
| for (ContradictionRule rule : contradictionRules) { | ||
| if (rule.checkContradiction(minesweeperBoard) == null) { | ||
| return false; | ||
| } | ||
| } | ||
| for (PuzzleElement<?> data : minesweeperBoard.getPuzzleElements()) { | ||
| final MinesweeperCell cell = (MinesweeperCell) data; | ||
| if (cell.getData().equals(MinesweeperTileData.empty())) { | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| @Contract(pure = true) | ||
| public void onBoardChange(@NotNull Board board) {} | ||
|
|
||
| @Override | ||
| @Contract(pure = true) | ||
| public boolean isValidDimensions(int rows, int columns) { | ||
| return rows >= 1 && columns >= 1; | ||
| } | ||
| } |
72 changes: 36 additions & 36 deletions
72
src/main/java/edu/rpi/legup/puzzle/minesweeper/MinesweeperBoard.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,36 @@ | ||
| package edu.rpi.legup.puzzle.minesweeper; | ||
|
|
||
| import edu.rpi.legup.model.gameboard.GridBoard; | ||
|
|
||
| public class MinesweeperBoard extends GridBoard { | ||
|
|
||
| public MinesweeperBoard(int width, int height) { | ||
| super(width, height); | ||
| } | ||
|
|
||
| public MinesweeperBoard(int size) { | ||
| super(size); | ||
| } | ||
|
|
||
| @Override | ||
| public MinesweeperCell getCell(int x, int y) { | ||
| return (MinesweeperCell) super.getCell(x, y); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Performs a deep copy of the Board | ||
| * | ||
| * @return a new copy of the board that is independent of this one | ||
| */ | ||
| @Override | ||
| public MinesweeperBoard copy() { | ||
| MinesweeperBoard newMinesweeperBoard = new MinesweeperBoard(this.dimension.width, this.dimension.height); | ||
| for (int x = 0; x < this.dimension.width; x++) { | ||
| for (int y = 0; y < this.dimension.height; y++) { | ||
| newMinesweeperBoard.setCell(x, y, getCell(x, y).copy()); | ||
| } | ||
| } | ||
| return newMinesweeperBoard; | ||
| } | ||
| } | ||
| package edu.rpi.legup.puzzle.minesweeper; | ||
|
|
||
| import edu.rpi.legup.model.gameboard.GridBoard; | ||
|
|
||
| public class MinesweeperBoard extends GridBoard { | ||
|
|
||
| public MinesweeperBoard(int width, int height) { | ||
| super(width, height); | ||
| } | ||
|
|
||
| public MinesweeperBoard(int size) { | ||
| super(size); | ||
| } | ||
|
|
||
| @Override | ||
| public MinesweeperCell getCell(int x, int y) { | ||
| return (MinesweeperCell) super.getCell(x, y); | ||
| } | ||
|
|
||
| /** | ||
| * Performs a deep copy of the Board | ||
| * | ||
| * @return a new copy of the board that is independent of this one | ||
| */ | ||
| @Override | ||
| public MinesweeperBoard copy() { | ||
| MinesweeperBoard newMinesweeperBoard = | ||
| new MinesweeperBoard(this.dimension.width, this.dimension.height); | ||
| for (int x = 0; x < this.dimension.width; x++) { | ||
| for (int y = 0; y < this.dimension.height; y++) { | ||
| newMinesweeperBoard.setCell(x, y, getCell(x, y).copy()); | ||
| } | ||
| } | ||
| return newMinesweeperBoard; | ||
| } | ||
| } |
Oops, something went wrong.