Merge pull request #436 from ChickoonLord/master

Go back to home screen when close puzzle file explore
Bram-Hub · Feb 7, 2023 · bc49d60 · bc49d60
2 parents b32a355 + 1e0e713
commit bc49d60
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/edu/rpi/legup/ui/HomePanel.java b/src/main/java/edu/rpi/legup/ui/HomePanel.java
@@ -53,7 +53,6 @@ public void actionPerformed(ActionEvent e) {
             }
             String fileName = (String) items[0];
             File puzzleFile = (File) items[1];
-            legupUI.displayPanel(1);
             legupUI.getProofEditor().loadPuzzle(fileName, puzzleFile);
         }
     };
@@ -68,7 +67,6 @@ public void actionPerformed(ActionEvent e) {
             }
             String fileName = (String) items[0];
             File puzzleFile = (File) items[1];
-            legupUI.displayPanel(2);
             legupUI.getPuzzleEditor().loadPuzzle(fileName, puzzleFile);
         }
     };

diff --git a/src/main/java/edu/rpi/legup/ui/ProofEditorPanel.java b/src/main/java/edu/rpi/legup/ui/ProofEditorPanel.java
@@ -395,11 +395,13 @@ public void loadPuzzle() {
     public void loadPuzzle(String fileName, File puzzleFile) {
         if (puzzleFile != null && puzzleFile.exists()) {
             try {
+                legupUI.displayPanel(1);
                 GameBoardFacade.getInstance().loadPuzzle(fileName);
                 String puzzleName = GameBoardFacade.getInstance().getPuzzleModule().getName();
                 frame.setTitle(puzzleName + " - " + puzzleFile.getName());
             }
             catch (InvalidFileFormatException e) {
+                legupUI.displayPanel(0);
                 LOGGER.error(e.getMessage());
                 if (e.getMessage().contains("Proof Tree construction error: could not find rule by ID")) { // TO DO: make error message not hardcoded
                     JOptionPane.showMessageDialog(null, "This file runs on an outdated version of Legup\nand is not compatible with the current version.", "Error", JOptionPane.ERROR_MESSAGE);

diff --git a/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java b/src/main/java/edu/rpi/legup/ui/PuzzleEditorPanel.java
@@ -330,11 +330,13 @@ public void loadPuzzle() {
     public void loadPuzzle(String fileName, File puzzleFile) {
         if (puzzleFile != null && puzzleFile.exists()) {
             try {
+                legupUI.displayPanel(2);
                 GameBoardFacade.getInstance().loadPuzzleEditor(fileName);
                 String puzzleName = GameBoardFacade.getInstance().getPuzzleModule().getName();
                 frame.setTitle(puzzleName + " - " + puzzleFile.getName());
             }
             catch (InvalidFileFormatException e) {
+                legupUI.displayPanel(0);
                 LOGGER.error(e.getMessage());
                 JOptionPane.showMessageDialog(null, "File does not exist, cannot be read, or cannot be edited", "Error", JOptionPane.ERROR_MESSAGE);
                 loadPuzzle();