Merge pull request #6117 from JabRef/refactor-save

Refactor SaveAction
JabRef · Mar 16, 2020 · c7e399c · c7e399c
2 parents 0628f11 + f52bd03
commit c7e399c
Show file tree

Hide file tree

Showing 14 changed files with 187 additions and 192 deletions.
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -431,7 +431,7 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
                 theFile = theFile.getAbsoluteFile();
             }
             BibDatabaseContext databaseContext = pr.getDatabaseContext();
-            databaseContext.setDatabaseFile(theFile);
+            databaseContext.setDatabasePath(theFile.toPath());
             Globals.prefs.fileDirForDatabase = databaseContext
                     .getFileDirectories(Globals.prefs.getFilePreferences());
             System.out.println(Localization.lang("Exporting") + ": " + data[0]);

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -57,7 +57,7 @@
 import org.jabref.gui.copyfiles.CopyFilesAction;
 import org.jabref.gui.customentrytypes.CustomizeEntryAction;
 import org.jabref.gui.customizefields.SetupGeneralFieldsAction;
-import org.jabref.gui.dialogs.AutosaveUIManager;
+import org.jabref.gui.dialogs.AutosaveUiManager;
 import org.jabref.gui.documentviewer.ShowDocumentViewerAction;
 import org.jabref.gui.duplicationFinder.DuplicateSearch;
 import org.jabref.gui.edit.CopyMoreAction;
@@ -1018,7 +1018,7 @@ public void addTab(BasePanel basePanel, boolean raisePanel) {
 
         if (readyForAutosave(context)) {
             AutosaveManager autosaver = AutosaveManager.start(context);
-            autosaver.registerListener(new AutosaveUIManager(basePanel));
+            autosaver.registerListener(new AutosaveUiManager(basePanel));
         }
 
         BackupManager.start(context, Globals.entryTypesManager, prefs);
@@ -1138,7 +1138,6 @@ private boolean confirmClose(BasePanel panel) {
             try {
                 SaveDatabaseAction saveAction = new SaveDatabaseAction(panel, Globals.prefs, Globals.entryTypesManager);
                 if (saveAction.save()) {
-                    // Saved, now exit.
                     return true;
                 }
                 // The action was either canceled or unsuccessful.

diff --git a/...jabref/gui/dialogs/AutosaveUIManager.java → ...jabref/gui/dialogs/AutosaveUiManager.java b/...jabref/gui/dialogs/AutosaveUIManager.java → ...jabref/gui/dialogs/AutosaveUiManager.java
@@ -10,16 +10,15 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * This class has an abstract UI role as it listens for an {@link AutosaveEvent}
- * and saves the bib file associated with the given {@link BasePanel}.
+ * This class has an abstract UI role as it listens for an {@link AutosaveEvent} and saves the bib file associated with
+ * the given {@link BasePanel}.
  */
-public class AutosaveUIManager {
+public class AutosaveUiManager {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveUiManager.class);
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveUIManager.class);
     private final BasePanel panel;
 
-
-    public AutosaveUIManager(BasePanel panel) {
+    public AutosaveUiManager(BasePanel panel) {
         this.panel = panel;
     }
 

diff --git a/src/main/java/org/jabref/gui/exporter/SaveAction.java b/src/main/java/org/jabref/gui/exporter/SaveAction.java
@@ -11,7 +11,7 @@
  */
 public class SaveAction extends SimpleCommand {
 
-    public enum SaveMethod { SAVE, SAVE_AS, SAVE_SELECTED }
+    public enum SaveMethod {SAVE, SAVE_AS, SAVE_SELECTED}
 
     private final SaveMethod saveMethod;
     private final JabRefFrame frame;
@@ -20,7 +20,6 @@ public SaveAction(SaveMethod saveMethod, JabRefFrame frame, StateManager stateMa
         this.saveMethod = saveMethod;
         this.frame = frame;
 
-
         if (saveMethod == SaveMethod.SAVE_SELECTED) {
             this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
         } else {

diff --git a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
@@ -23,12 +23,9 @@ public void execute() {
 
         for (BasePanel panel : frame.getBasePanelList()) {
             SaveDatabaseAction saveDatabaseAction = new SaveDatabaseAction(panel, Globals.prefs, Globals.entryTypesManager);
-            if (panel.getBibDatabaseContext().getDatabasePath().isEmpty()) {
-                //It will ask a path before saving.
-                saveDatabaseAction.saveAs();
-            } else {
-                saveDatabaseAction.save();
-                // TODO: can we find out whether the save was actually done or not?
+            boolean saveResult = saveDatabaseAction.save();
+            if (!saveResult) {
+                dialogService.notify(Localization.lang("Could not save file."));
             }
         }