From 3ea16a65eb60c8f3ae758d365c731159e353f2fc Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 26 Sep 2020 23:18:45 +0200 Subject: [PATCH] fix checkstyle --- src/main/java/org/jabref/gui/JabRefFrame.java | 1 + .../org/jabref/gui/dialogs/AutosaveUiManager.java | 3 ++- .../jabref/gui/exporter/SaveDatabaseAction.java | 15 ++++++--------- .../jabref/logic/exporter/GlobalSaveManager.java | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java index d9aad22bfc7..eb6869a522e 100644 --- a/src/main/java/org/jabref/gui/JabRefFrame.java +++ b/src/main/java/org/jabref/gui/JabRefFrame.java @@ -1148,6 +1148,7 @@ public void addTab(BasePanel basePanel, boolean raisePanel) { basePanel.getUndoManager().registerListener(new UndoRedoEventManager()); BibDatabaseContext context = basePanel.getBibDatabaseContext(); + GlobalSaveManager manager = GlobalSaveManager.create(basePanel, prefs, Globals.entryTypesManager); if (readyForAutosave(context)) { AutosaveManager autosaver = AutosaveManager.start(context); diff --git a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java index 3ff39487898..4252bb4c08b 100644 --- a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java +++ b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java @@ -14,6 +14,7 @@ * the given {@link BasePanel}. */ public class AutosaveUiManager { + private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveUiManager.class); private final BasePanel panel; @@ -25,7 +26,7 @@ public AutosaveUiManager(BasePanel panel) { @Subscribe public void listen(@SuppressWarnings("unused") AutosaveEvent event) { try { - SaveDatabaseAction saveAction = new SaveDatabaseAction(panel, Globals.prefs, Globals.entryTypesManager); + SaveDatabaseAction saveAction = new SaveDatabaseAction(panel, Globals.prefs, Globals.entryTypesManager); saveAction.save(SaveDatabaseAction.SaveDatabaseMode.SILENT); } catch (Throwable e) { LOGGER.error("Problem occurred while saving.", e); diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java index fe961b4c0bf..083b8cb46f2 100644 --- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java +++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java @@ -2,7 +2,6 @@ import java.nio.charset.Charset; import java.nio.file.Path; -import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.Set; @@ -51,7 +50,6 @@ public class SaveDatabaseAction { private static final Logger LOGGER = LoggerFactory.getLogger(SaveDatabaseAction.class); - private static Set runningInstances = new HashSet<>(); private final BasePanel panel; private final JabRefFrame frame; @@ -218,8 +216,8 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) { } private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding, SavePreferences.DatabaseSaveType saveType) throws SaveException { - GlobalSaveManager manager = GlobalSaveManager.create(panel, preferences, entryTypesManager); + SavePreferences preferences = this.preferences.getSavePreferences() .withEncoding(encoding) .withSaveType(saveType); @@ -229,7 +227,7 @@ private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding, var future = manager.save(file, selectedOnly, encoding, saveType, panel.getBibDatabaseContext(), consumer); Set characters; try { - characters =future.get(); + characters = future.get(); if (!characters.isEmpty()) { saveWithDifferentEncoding(file, selectedOnly, preferences.getEncoding(), characters, saveType); } @@ -242,7 +240,6 @@ private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding, } - private void saveWithDifferentEncoding(Path file, boolean selectedOnly, Charset encoding, Set encodingProblems, SavePreferences.DatabaseSaveType saveType) throws SaveException { DialogPane pane = new DialogPane(); VBox vbox = new VBox(); @@ -271,10 +268,10 @@ private void saveWithDifferentEncoding(Path file, boolean selectedOnly, Charset private boolean readyForAutosave(BibDatabaseContext context) { return ((context.getLocation() == DatabaseLocation.SHARED) || - ((context.getLocation() == DatabaseLocation.LOCAL) - && preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE))) - && - context.getDatabasePath().isPresent(); + ((context.getLocation() == DatabaseLocation.LOCAL) + && preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE))) + && + context.getDatabasePath().isPresent(); } private boolean readyForBackup(BibDatabaseContext context) { diff --git a/src/main/java/org/jabref/logic/exporter/GlobalSaveManager.java b/src/main/java/org/jabref/logic/exporter/GlobalSaveManager.java index bdddf5f15dc..0cff3ca5d60 100644 --- a/src/main/java/org/jabref/logic/exporter/GlobalSaveManager.java +++ b/src/main/java/org/jabref/logic/exporter/GlobalSaveManager.java @@ -54,7 +54,7 @@ private void shutdown() { } - public Future> save(Path file, boolean selectedOnly, Charset encoding, SavePreferences.DatabaseSaveType saveType, BibDatabaseContext context, Consumer> consumeFieldChanges) throws SaveException { + public Future> save(Path file, boolean selectedOnly, Charset encoding, SavePreferences.DatabaseSaveType saveType, BibDatabaseContext context, Consumer> consumeFieldChanges) { return throttler.scheduleTask(() -> saveThrotteld(file, selectedOnly, encoding, saveType, context, consumeFieldChanges)); }