Fix for LightUp and TreeTent Puzzle Creators

src/main/java/edu/rpi/legup/puzzle/lightup/LightUpCell.java

@@ -1,8 +1,10 @@
 package edu.rpi.legup.puzzle.lightup;
 
+import edu.rpi.legup.model.elements.Element;
 import edu.rpi.legup.model.gameboard.GridCell;
 
 import java.awt.*;
+import java.awt.event.MouseEvent;
 
 public class LightUpCell extends GridCell<Integer> {
     private boolean isLite;
@@ -30,6 +32,50 @@ public LightUpCellType getType() {
         return null;
     }
 
+    /**
+     * Sets the type of this LightUpCell
+     *
+     * @param e element to set the type of this LightUp cell to
+     * @param m mouse event being processed
+     */
+    @Override
+    public void setType(Element e, MouseEvent m) {
+        switch(e.getElementName()) {
+            case "Black Tile":
+                this.data = -1;
+                break;
+            case "Bulb Tile":
+                this.data = -4;
+                break;
+            case "Number Tile":
+                if (m.getButton() == MouseEvent.BUTTON1) {
+                    // Place a number tile if not a number tile
+                    if (this.data < 0 || this.data >= 9) {
+                        this.data = 1;
+                    }
+                    else {
+                        // Increase number
+                        this.data++;
+                    }
+                }
+                else {
+                    if (m.getButton() == MouseEvent.BUTTON3) {
+                        // Decrease number value (down to 1) if pressing number tile
+                        if (this.data > 1 && this.data <= 8) {
+                            this.data--;
+                        }
+                        else {
+                            this.data = 1;
+                        }
+                    }
+                }
+                break;
+            default:
+                this.data = -3;
+                break;
+        }
+    }
+
     public boolean isLite() {
         return isLite;
     }

src/main/java/edu/rpi/legup/puzzle/lightup/LightUpExporter.java

@@ -12,7 +12,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()));

src/main/java/edu/rpi/legup/puzzle/lightup/elements/BlackTile.java

@@ -1,8 +1,8 @@
 package edu.rpi.legup.puzzle.lightup.elements;
 
-import edu.rpi.legup.model.elements.PlaceableElement;
+import edu.rpi.legup.model.elements.NonPlaceableElement;
 
-public class BlackTile extends PlaceableElement {
+public class BlackTile extends NonPlaceableElement {
     public BlackTile() {
         super("LTUP-PLAC-0002", "Black Tile", "The black tile", "edu/rpi/legup/images/lightup/black.gif");
     }

src/main/java/edu/rpi/legup/puzzle/lightup/elements/UnknownTile.java

@@ -0,0 +1,9 @@
+package edu.rpi.legup.puzzle.lightup.elements;
+
+import edu.rpi.legup.model.elements.NonPlaceableElement;
+
+public class UnknownTile extends NonPlaceableElement {
+    public UnknownTile() {
+        super("NURI-UNPL-0002", "Unknown Tile", "A blank tile", "edu/rpi/legup/images/lightup/UnknownTile.png");
+    }
+}

src/main/java/edu/rpi/legup/puzzle/treetent/TreeTentCell.java

@@ -21,12 +21,16 @@ public void setType(Element e, MouseEvent m) {
         switch (e.getElementName()) {
             case "Unknown Tile":
                 this.data = TreeTentType.UNKNOWN;
+                break;
             case "Tree Tile":
                 this.data = TreeTentType.TREE;
+                break;
             case "Grass Tile":
                 this.data = TreeTentType.GRASS;
+                break;
             case "Tent Tile":
                 this.data = TreeTentType.TENT;
+                break;
         }
     }
 

src/main/java/edu/rpi/legup/puzzle/treetent/TreeTentCellFactory.java

@@ -28,7 +28,7 @@ public PuzzleElement importCell(Node node, Board board) throws InvalidFileFormat
             NamedNodeMap attributeList = node.getAttributes();
             if (node.getNodeName().equalsIgnoreCase("cell")) {
 
-                int value = Integer.valueOf(attributeList.getNamedItem("value").getNodeValue());
+                int value = TreeTentType.valueToInt(attributeList.getNamedItem("value").getNodeValue());
                 int x = Integer.valueOf(attributeList.getNamedItem("x").getNodeValue());
                 int y = Integer.valueOf(attributeList.getNamedItem("y").getNodeValue());
                 if (x >= width || y >= height) {

src/main/java/edu/rpi/legup/puzzle/treetent/TreeTentType.java

@@ -18,4 +18,17 @@ public static TreeTentType valueOf(int num) {
                 return UNKNOWN;
         }
     }
+
+    public static int valueToInt(String value) {
+        switch(value) {
+            case "TREE":
+                return 1;
+            case "GRASS":
+                return 2;
+            case "TENT":
+                return 3;
+            default:
+                return 0;
+        }
+    }
 }