Resolves #1813 Use WORKING_DIRECTORY instead of FILE_WORKING_DIRECTORY

JabRef · Oct 19, 2016 · 134a051 · 134a051
1 parent fa16bc6
commit 134a051
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/net/sf/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java b/src/main/java/net/sf/jabref/gui/externalfiletype/ExternalFileTypeEntryEditor.java
@@ -55,13 +55,13 @@ public class ExternalFileTypeEntryEditor {
     private final ActionListener browsePressed = e -> {
         String appDir = application.getText().trim();
         if (appDir.isEmpty()) {
-            appDir = Globals.prefs.get(JabRefPreferences.FILE_WORKING_DIRECTORY);
+            appDir = Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY);
         }
 
         Optional<Path> path = new FileDialog(fParent, appDir).showDialogAndGetSelectedFile();
         path.ifPresent(applicationDir -> {
             if (applicationDir.getParent() != null) {
-                Globals.prefs.put(JabRefPreferences.FILE_WORKING_DIRECTORY, applicationDir.getParent().toString());
+                Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, applicationDir.getParent().toString());
             }
             application.setText(applicationDir.toString());
         });

diff --git a/src/main/java/net/sf/jabref/gui/filelist/FileListEntryEditor.java b/src/main/java/net/sf/jabref/gui/filelist/FileListEntryEditor.java
@@ -343,15 +343,15 @@ public boolean okPressed() {
         if (file.isPresent()) {
             workingDir = file.get().getPath();
         } else {
-            workingDir = Globals.prefs.get(JabRefPreferences.FILE_WORKING_DIRECTORY);
+            workingDir = Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY);
         }
 
         Optional<Path> path = new FileDialog(this.frame, workingDir).showDialogAndGetSelectedFile();
 
         path.ifPresent(selection -> {
             File newFile = selection.toFile();
             // Store the directory for next time:
-            Globals.prefs.put(JabRefPreferences.FILE_WORKING_DIRECTORY, newFile.getPath());
+            Globals.prefs.put(JabRefPreferences.WORKING_DIRECTORY, newFile.getPath());
 
             // If the file is below the file directory, make the path relative:
             List<String> fileDirs = this.databaseContext.getFileDirectory(Globals.prefs.getFileDirectoryPreferences());

diff --git a/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java b/src/main/java/net/sf/jabref/preferences/JabRefPreferences.java
@@ -195,7 +195,6 @@ public class JabRefPreferences {
     public static final String BACKUP = "backup";
 
     public static final String AUTO_OPEN_FORM = "autoOpenForm";
-    public static final String FILE_WORKING_DIRECTORY = "fileWorkingDirectory";
     public static final String IMPORT_WORKING_DIRECTORY = "importWorkingDirectory";
     public static final String EXPORT_WORKING_DIRECTORY = "exportWorkingDirectory";
     public static final String PREFS_EXPORT_PATH = "prefsExportPath";
@@ -598,7 +597,6 @@ private JabRefPreferences() {
         defaults.put(EXPORT_WORKING_DIRECTORY, USER_HOME);
         // Remembers working directory of last import
         defaults.put(IMPORT_WORKING_DIRECTORY, USER_HOME);
-        defaults.put(FILE_WORKING_DIRECTORY, USER_HOME);
         defaults.put(PREFS_EXPORT_PATH, WORKING_DIRECTORY);
         defaults.put(AUTO_OPEN_FORM, Boolean.TRUE);
         defaults.put(BACKUP, Boolean.TRUE);