Merge branch 'dev' into emptyFieldTests

Bram-Hub · Oct 17, 2023 · 2adc566 · 2adc566
2 parents b8b2c8f + e05d8e5
commit 2adc566
Show file tree

Hide file tree

Showing 3 changed files with 759 additions and 784 deletions.
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);
             }