Merge branch 'dev' into finishWithGrassTests

Kevin-771 · Oct 20, 2023 · 52dcaa6 · 52dcaa6
2 parents 95c13d5 + f69fbe3
commit 52dcaa6
Show file tree

Hide file tree

Showing 52 changed files with 1,964 additions and 975 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,6 @@ dependencies {
     implementation 'org.jetbrains:annotations:20.1.0'
     implementation 'org.jetbrains:annotations:20.1.0'
     implementation 'com.formdev:flatlaf:3.0'
-    implementation project(':legup-update')
     implementation 'com.google.firebase:firebase-admin:6.3.0'
     implementation 'org.apache.httpcomponents:httpclient:4.5.1'
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'

diff --git a/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/BlockInVerticalPath b/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/BlockInVerticalPath
diff --git a/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/CannotFillMiddle b/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/CannotFillMiddle
diff --git a/...d/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInHorizontalPath b/...d/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInHorizontalPath
diff --git a/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInVerticalPath b/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInVerticalPath
diff --git a/.../resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillCorners b/.../resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillCorners
diff --git a/...d/resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillMiddle b/...d/resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillMiddle
diff --git a/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/BlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/BlockEnclosed
diff --git a/...ources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CompleteBoardBlockEnclosed b/...ources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CompleteBoardBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CornerBlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CornerBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/ManyBlocksEnclosed b/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/ManyBlocksEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/BlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/BlockEnclosed
diff --git a/...urces/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CompleteBoardBlockEnclosed b/...urces/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CompleteBoardBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CornerBlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CornerBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/ManyBlocksEnclosed b/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/ManyBlocksEnclosed
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,2 @@
 rootProject.name = 'Legup'
-include ':legup'
-include ':legup-update'
 
diff --git a/src/main/java/edu/rpi/legup/controller/TreeController.java b/src/main/java/edu/rpi/legup/controller/TreeController.java
@@ -2,6 +2,7 @@
 
 import edu.rpi.legup.model.Puzzle;
 import edu.rpi.legup.model.tree.Tree;
+import edu.rpi.legup.model.tree.TreeElementType;
 import edu.rpi.legup.ui.boardview.BoardView;
 import edu.rpi.legup.ui.proofeditorui.treeview.*;
 
@@ -42,7 +43,7 @@ public void mousePressed(MouseEvent e) {
 
     /**
      * Mouse Released event sets the cursor back to the default cursor and reset info for panning
-     *
+     * Set board modifiability
      * @param e MouseEvent object
      */
     @Override

diff --git a/src/main/java/edu/rpi/legup/history/ValidateContradictionRuleCommand.java b/src/main/java/edu/rpi/legup/history/ValidateContradictionRuleCommand.java
@@ -66,9 +66,11 @@ public void executeCommand() {
             if (transition == null) {
                 transition = tree.addNewTransition(treeNode);
                 transition.setRule(newRule);
+                transition.getBoard().setModifiable(false);
                 tree.addTreeElement(transition);
             }
             else {
+                transition.getBoard().setModifiable(false);
                 tree.addTreeElement(treeNode, transition);
             }
 

diff --git a/src/main/java/edu/rpi/legup/puzzle/fillapix/FillapixExporter.java b/src/main/java/edu/rpi/legup/puzzle/fillapix/FillapixExporter.java
@@ -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 {
@@ -15,7 +16,7 @@ protected org.w3c.dom.Element createBoardElement(Document newDocument) {
         FillapixBoard board;
         if (puzzle.getTree() != null) {
             board = (FillapixBoard) puzzle.getTree().getRootNode().getBoard();
-        } 
+        }
         else {
             board = (FillapixBoard) puzzle.getBoardView().getBoard();
         }

diff --git a/src/main/java/edu/rpi/legup/puzzle/fillapix/FillapixUtilities.java b/src/main/java/edu/rpi/legup/puzzle/fillapix/FillapixUtilities.java
@@ -154,7 +154,7 @@ public static ArrayList<FillapixCell> getCellsAtDistance(FillapixBoard board, Fi
      * 
      * @return an ArrayList of Boolean arrays. Each index in the ArrayList represents
      * a distinct combination. Each Boolean array will be <code>totalNumItems</code>
-     * long and each index will be <code>true<\code> if the corresponding item is
+     * long and each index will be <code>true</code> if the corresponding item is
      * included in that combination, and <code>false</code> otherwise.
      */
     public static ArrayList<boolean[]> getCombinations(int chosenNumItems, int totalNumItems) {