Merge branch 'dev' into add_checkstyle

Bram-Hub · Jul 26, 2022 · b0c2c69 · b0c2c69
2 parents 9160d1e + be65edf
commit b0c2c69
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/main/java/edu/rpi/legup/ui/ProofEditorPanel.java b/src/main/java/edu/rpi/legup/ui/ProofEditorPanel.java
@@ -315,14 +315,14 @@ public void promptPuzzle() {
             }
         }
 
-        folderBrowser = new JFileChooser();
-
+        LegupPreferences preferences = LegupPreferences.getInstance();
+        File preferredDirectory = new File(preferences.getUserPref(LegupPreferences.WORK_DIRECTORY));
+        folderBrowser = new JFileChooser(preferredDirectory);
+        folderBrowser.setDialogTitle("Select Proof File");
         folderBrowser.showOpenDialog(this);
-        folderBrowser.setVisible(true);
-        folderBrowser.setCurrentDirectory(new java.io.File("."));
-        folderBrowser.setDialogTitle("Select Directory");
         folderBrowser.setFileSelectionMode(JFileChooser.FILES_ONLY);
         folderBrowser.setAcceptAllFileFilterUsed(true);
+        folderBrowser.setVisible(true);
 
         String fileName = null;
         File puzzleFile = folderBrowser.getSelectedFile();
@@ -599,11 +599,14 @@ private void checkProofAll() {
          *    |       |
          *    |       | -> Proofs
          */
-        folderBrowser = new JFileChooser();
+
+        LegupPreferences preferences = LegupPreferences.getInstance();
+        File preferredDirectory = new File(preferences.getUserPref(LegupPreferences.WORK_DIRECTORY));
+        folderBrowser = new JFileChooser(preferredDirectory);
 
         folderBrowser.showOpenDialog(this);
         folderBrowser.setVisible(true);
-        folderBrowser.setCurrentDirectory(new java.io.File("."));
+        folderBrowser.setCurrentDirectory(new File(LegupPreferences.WORK_DIRECTORY));
         folderBrowser.setDialogTitle("Select Directory");
         folderBrowser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
         folderBrowser.setAcceptAllFileFilterUsed(false);