Resolve puzzle-editor merge conflicts

.gitignore

@@ -139,3 +139,6 @@ gradle-app.setting
 .classpath
 
 # End of https://www.toptal.com/developers/gitignore/api/intellij+all,gradle,java
+
+**/.DS_Store
+gradle/wrapper/gradle-wrapper.properties

README.md

@@ -29,7 +29,7 @@ An example for the Battleship puzzle demonstrates the proper format for XML file
 
 ```
 <edu.rpi.legup.Legup>
-    <edu.rpi.legup.puzzle qualifiedClassName="edu.rpi.legup.puzzle.battleship.BattleShip">
+    <edu.rpi.legup.puzzle qualifiedClassName="edu.rpi.legup.puzzle.battleship.Battleship">
         <board size="10">
             <puzzleElement>
                 <puzzleElement value="1" x="2" y="0"/>

bin/main/edu/rpi/legup/legup/config

@@ -1,6 +1,6 @@
 <Legup version="2.0">
     <puzzles>
-        <puzzle name="BattleShip" qualifiedClassName="edu.rpi.legup.puzzle.battleship.BattleShip" fileType=".xml"/>
+        <puzzle name="BattleShip" qualifiedClassName="edu.rpi.legup.puzzle.battleship.Battleship" fileType=".xml"/>
         <puzzle name="Fillapix" qualifiedClassName="edu.rpi.legup.puzzle.fillapix.Fillapix" fileType=".xml"/>
         <puzzle name="Heyawake" qualifiedClassName="edu.rpi.legup.puzzle.heyawake.Heyawake" fileType=".xml"/>
         <puzzle name="LightUp" qualifiedClassName="edu.rpi.legup.puzzle.lightup.LightUp" fileType=".xml"/>

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

src/main/java/edu/rpi/legup/controller/Controller.java

@@ -117,11 +117,15 @@ public void mouseMoved(MouseEvent e) {
      */
     @Override
     public void mouseWheelMoved(MouseWheelEvent e) {
-    	System.out.println(e.getWheelRotation());
+        // System.out.println(e.getWheelRotation());
         if (e.isControlDown()) {
-            viewer.zoom(e.getWheelRotation() * 2, e.getPoint());
+            if (e.getWheelRotation() != 0){
+                viewer.zoom(e.getWheelRotation() * 2, e.getPoint());
+            }
         } else {
-            viewer.zoom(e.getWheelRotation(), e.getPoint());
+            if (e.getWheelRotation() != 0) {
+                viewer.zoom(e.getWheelRotation(), e.getPoint());
+            }
         }
     }
 }

src/main/java/edu/rpi/legup/controller/TreeController.java

@@ -5,6 +5,7 @@
 import edu.rpi.legup.ui.boardview.BoardView;
 import edu.rpi.legup.ui.proofeditorui.treeview.*;
 
+import javax.swing.*;
 import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
@@ -149,6 +150,6 @@ public void mouseMoved(MouseEvent e) {
      */
     @Override
     public void mouseWheelMoved(MouseWheelEvent e) {
-        super.mouseWheelMoved(e);
+        super.viewer.scroll(e.getWheelRotation());
     }
 }

src/main/java/edu/rpi/legup/model/gameboard/Board.java

@@ -146,7 +146,7 @@ public void removeModifiedData(PuzzleElement data) {
      */
     @SuppressWarnings("unchecked")
     public void notifyChange(PuzzleElement puzzleElement) {
-        puzzleElements.get(puzzleElement.getIndex()).setData(puzzleElement.getData());
+        puzzleElements.set(puzzleElement.getIndex(), puzzleElement);
     }
 
     /**

src/main/java/edu/rpi/legup/model/tree/TreeElement.java

@@ -24,7 +24,7 @@ public TreeElement(TreeElementType type) {
     public abstract boolean isContradictoryBranch();
 
     /**
-     * Recursively determines if the sub tree rooted at this tree puzzleElement is valid by checking
+     * Recursively determines if the sub-tree rooted at this tree puzzleElement is valid by checking
      * whether this tree puzzleElement and all descendants of this tree puzzleElement is justified
      * and justified correctly
      *

src/main/java/edu/rpi/legup/puzzle/battleship/BattleShip.java → src/main/java/edu/rpi/legup/puzzle/battleship/Battleship.java

@@ -2,22 +2,28 @@
 
 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;
 
-public class BattleShip extends Puzzle {
-    public BattleShip() {
+public class Battleship extends Puzzle {
+    public Battleship() {
         super();
 
-        this.name = "BattleShip";
+        this.name = "Battleship";
 
-        this.importer = new BattleShipImporter(this);
-        this.exporter = new BattleShipExporter(this);
+        this.importer = new BattleshipImporter(this);
+        this.exporter = new BattleshipExporter(this);
 
-        this.factory = new BattleShipCellFactory();
+        this.factory = new BattleshipCellFactory();
     }
 
+    /**
+     * Initializes the game board. Called by the invoker of the class
+     */
     @Override
     public void initializeView() {
-        boardView = new BattleShipView((BattleShipBoard) currentBoard);
+        boardView = new BattleshipView((BattleshipBoard) currentBoard);
+        addBoardListener(boardView);
     }
 
     @Override
@@ -46,9 +52,27 @@ public boolean isValidDimensions(int rows, int columns) {
      */
     @Override
     public boolean isBoardComplete(Board board) {
-        return false;
+        BattleshipBoard battleShipBoard = (BattleshipBoard) board;
+
+        for (ContradictionRule rule : contradictionRules) {
+            if (rule.checkContradiction(battleShipBoard) == null) {
+                return false;
+            }
+        }
+        for (PuzzleElement data : battleShipBoard.getPuzzleElements()) {
+            BattleshipCell cell = (BattleshipCell) data;
+            if (cell.getType() == BattleshipType.UNKNOWN) {
+                return false;
+            }
+        }
+        return true;
     }
 
+    /**
+     * Callback for when the board puzzleElement changes
+     *
+     * @param board the board that has changed
+     */
     @Override
     public void onBoardChange(Board board) {
 
@@ -111,7 +135,7 @@ public void importPuzzle(String fileName) {
 //                int y = Integer.valueOf(cells.item(i).getAttributes().getNamedItem("y").getNodeValue());
 //                String value = cells.item(i).getAttributes().getNamedItem("value").getNodeValue().toUpperCase();
 //
-//                BattleShipCell cell = new BattleShipCell(BattleShipCellType.valueOf(value).ordinal(), new Point(x, y));
+//                BattleShipCell cell = new BattleShipCell(BattleShipType.valueOf(value).ordinal(), new Point(x, y));
 //                battleShipBoard.setCell(x, y, cell);
 //                cell.setModifiable(false);
 //                cell.setGiven(true);