Skip to content

Commit

Permalink
Merge pull request #625 from charlestian23/dev
Browse files Browse the repository at this point in the history 
Null board when creating new puzzle file bug fix
  • Loading branch information
@Chase-Grajeda
Chase-Grajeda authored Oct 3, 2023
2 parents bcb8629 + f1c7985 commit 7ff8873
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 7 deletions.
9 changes: 8 additions & 1 deletion src/main/java/edu/rpi/legup/puzzle/battleship/BattleshipExporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import edu.rpi.legup.model.PuzzleExporter;
import edu.rpi.legup.model.gameboard.PuzzleElement;
import edu.rpi.legup.puzzle.shorttruthtable.ShortTruthTableBoard;
import org.w3c.dom.Document;

public class BattleshipExporter extends PuzzleExporter {
Expand All @@ -18,7 +19,13 @@ public BattleshipExporter(Battleship battleShip) {
*/
@Override
protected org.w3c.dom.Element createBoardElement(Document newDocument) {
BattleshipBoard board = (BattleshipBoard) puzzle.getTree().getRootNode().getBoard();
BattleshipBoard board;
if (puzzle.getTree() != null) {
board = (BattleshipBoard) puzzle.getTree().getRootNode().getBoard();
}
else {
board = (BattleshipBoard) puzzle.getBoardView().getBoard();
}

org.w3c.dom.Element boardElement = newDocument.createElement("board");
boardElement.setAttribute("width", String.valueOf(board.getWidth()));
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/edu/rpi/legup/puzzle/fillapix/FillapixExporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import edu.rpi.legup.model.PuzzleExporter;
import edu.rpi.legup.model.gameboard.PuzzleElement;
import edu.rpi.legup.puzzle.shorttruthtable.ShortTruthTableBoard;
import org.w3c.dom.Document;

public class FillapixExporter extends PuzzleExporter {
Expand All @@ -12,7 +13,13 @@ public FillapixExporter(Fillapix fillapix) {

@Override
protected org.w3c.dom.Element createBoardElement(Document newDocument) {
FillapixBoard board = (FillapixBoard) puzzle.getTree().getRootNode().getBoard();
FillapixBoard board;
if (puzzle.getTree() != null) {
board = (FillapixBoard) puzzle.getTree().getRootNode().getBoard();
}
else {
board = (FillapixBoard) puzzle.getBoardView().getBoard();
}

org.w3c.dom.Element boardElement = newDocument.createElement("board");
boardElement.setAttribute("width", String.valueOf(board.getWidth()));
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/edu/rpi/legup/puzzle/heyawake/HeyawakeExporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import edu.rpi.legup.model.PuzzleExporter;
import edu.rpi.legup.model.gameboard.PuzzleElement;
import edu.rpi.legup.puzzle.shorttruthtable.ShortTruthTableBoard;
import org.w3c.dom.Document;

public class HeyawakeExporter extends PuzzleExporter {
Expand All @@ -12,7 +13,13 @@ public HeyawakeExporter(Heyawake heyawake) {

@Override
protected org.w3c.dom.Element createBoardElement(Document newDocument) {
HeyawakeBoard board = (HeyawakeBoard) puzzle.getTree().getRootNode().getBoard();
HeyawakeBoard board;
if (puzzle.getTree() != null) {
board = (HeyawakeBoard) puzzle.getTree().getRootNode().getBoard();
}
else {
board = (HeyawakeBoard) puzzle.getBoardView().getBoard();
}

org.w3c.dom.Element boardElement = newDocument.createElement("board");
boardElement.setAttribute("width", String.valueOf(board.getWidth()));
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/edu/rpi/legup/puzzle/lightup/LightUpExporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import edu.rpi.legup.model.PuzzleExporter;
import edu.rpi.legup.model.gameboard.PuzzleElement;
import edu.rpi.legup.puzzle.shorttruthtable.ShortTruthTableBoard;
import org.w3c.dom.Document;

public class LightUpExporter extends PuzzleExporter {
Expand All @@ -12,7 +13,13 @@ public LightUpExporter(LightUp lightUp) {

@Override
protected org.w3c.dom.Element createBoardElement(Document newDocument) {
LightUpBoard board = (LightUpBoard) puzzle.getTree().getRootNode().getBoard();
LightUpBoard board;
if (puzzle.getTree() != null) {
board = (LightUpBoard) puzzle.getTree().getRootNode().getBoard();
}
else {
board = (LightUpBoard) puzzle.getBoardView().getBoard();
}

org.w3c.dom.Element boardElement = newDocument.createElement("board");
boardElement.setAttribute("width", String.valueOf(board.getWidth()));
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/edu/rpi/legup/puzzle/masyu/MasyuExporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import edu.rpi.legup.model.PuzzleExporter;
import edu.rpi.legup.model.gameboard.PuzzleElement;
import edu.rpi.legup.puzzle.shorttruthtable.ShortTruthTableBoard;
import org.w3c.dom.Document;

public class MasyuExporter extends PuzzleExporter {
Expand All @@ -12,7 +13,13 @@ public MasyuExporter(Masyu masyu) {

@Override
protected org.w3c.dom.Element createBoardElement(Document newDocument) {
MasyuBoard board = (MasyuBoard) puzzle.getTree().getRootNode().getBoard();
MasyuBoard board;
if (puzzle.getTree() != null) {
board = (MasyuBoard) puzzle.getTree().getRootNode().getBoard();
}
else {
board = (MasyuBoard) puzzle.getBoardView().getBoard();
}

org.w3c.dom.Element boardElement = newDocument.createElement("board");
boardElement.setAttribute("width", String.valueOf(board.getWidth()));
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/edu/rpi/legup/puzzle/skyscrapers/SkyscrapersExporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import edu.rpi.legup.model.PuzzleExporter;
import edu.rpi.legup.model.gameboard.PuzzleElement;
import edu.rpi.legup.puzzle.shorttruthtable.ShortTruthTableBoard;
import org.w3c.dom.Document;

public class SkyscrapersExporter extends PuzzleExporter {
Expand All @@ -12,7 +13,13 @@ public SkyscrapersExporter(Skyscrapers skyscrapers) {

@Override
protected org.w3c.dom.Element createBoardElement(Document newDocument) {
SkyscrapersBoard board = (SkyscrapersBoard) puzzle.getTree().getRootNode().getBoard();
SkyscrapersBoard board;
if (puzzle.getTree() != null) {
board = (SkyscrapersBoard) puzzle.getTree().getRootNode().getBoard();
}
else {
board = (SkyscrapersBoard) puzzle.getBoardView().getBoard();
}

org.w3c.dom.Element boardElement = newDocument.createElement("board");
boardElement.setAttribute("width", String.valueOf(board.getWidth()));
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/edu/rpi/legup/puzzle/sudoku/SudokuExporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import edu.rpi.legup.model.PuzzleExporter;
import edu.rpi.legup.model.gameboard.PuzzleElement;
import edu.rpi.legup.puzzle.skyscrapers.SkyscrapersBoard;
import org.w3c.dom.Document;

public class SudokuExporter extends PuzzleExporter {
Expand All @@ -12,7 +13,13 @@ public SudokuExporter(Sudoku sudoku) {

@Override
protected org.w3c.dom.Element createBoardElement(Document newDocument) {
SudokuBoard board = (SudokuBoard) puzzle.getTree().getRootNode().getBoard();
SudokuBoard board;
if (puzzle.getTree() != null) {
board = (SudokuBoard) puzzle.getTree().getRootNode().getBoard();
}
else {
board = (SudokuBoard) puzzle.getBoardView().getBoard();
}

org.w3c.dom.Element boardElement = newDocument.createElement("board");
boardElement.setAttribute("size", String.valueOf(board.getSize()));
Expand Down

0 comments on commit 7ff8873

Please sign in to comment.