From b6451f1f7e5f383979a85c36260090fc60605fb1 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Thu, 14 Aug 2025 19:22:54 +0200 Subject: [PATCH 1/2] fix git modules requires and uses --- .../org.jabref.gradle.base.dependency-rules.gradle.kts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts index c92897f75b9..966b71817db 100644 --- a/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts +++ b/build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts @@ -236,7 +236,11 @@ extraJavaModuleInfo { } module("org.apache.pdfbox:pdfbox-io", "org.apache.pdfbox.io") module("org.apache.velocity:velocity-engine-core", "velocity.engine.core") - module("org.eclipse.jgit:org.eclipse.jgit", "org.eclipse.jgit") + module("org.eclipse.jgit:org.eclipse.jgit", "org.eclipse.jgit") { + exportAllPackages() + requires("org.slf4j") + uses("org.eclipse.jgit.lib.SignerFactory") + } module("org.fxmisc.undo:undofx", "org.fxmisc.undo") module("org.fxmisc.wellbehaved:wellbehavedfx", "wellbehavedfx") { exportAllPackages() From 25f84acabf03008e401d69d2401e778dfa1a8f91 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 13 Sep 2025 18:40:14 +0200 Subject: [PATCH 2/2] Fix Autosave manager exception on shutdown --- .../gui/autosaveandbackup/AutosaveManager.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jabgui/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java b/jabgui/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java index 95b7c9b3ffe..4f81cc2c0b2 100644 --- a/jabgui/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java +++ b/jabgui/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java @@ -44,8 +44,8 @@ private AutosaveManager(BibDatabaseContext bibDatabaseContext, CoarseChangeFilte this.executor.scheduleAtFixedRate( () -> { if (needsSave) { - eventBus.post(new AutosaveEvent()); - needsSave = false; + eventBus.post(new AutosaveEvent()); + needsSave = false; } }, DELAY_BETWEEN_AUTOSAVE_ATTEMPTS_IN_SECONDS, @@ -61,7 +61,11 @@ public void listen(@SuppressWarnings("unused") BibDatabaseContextChangedEvent ev } private void shutdown() { - coarseChangeFilter.unregisterListener(this); + try { + coarseChangeFilter.unregisterListener(this); + } catch (IllegalArgumentException e) { + // ignore exception if the listener was not registered before + } runningInstances.remove(this); } @@ -83,7 +87,7 @@ public static AutosaveManager start(BibDatabaseContext bibDatabaseContext, Coars */ public static void shutdown(BibDatabaseContext bibDatabaseContext) { runningInstances.stream().filter(instance -> instance.bibDatabaseContext == bibDatabaseContext).findAny() - .ifPresent(instance -> instance.shutdown()); + .ifPresent(AutosaveManager::shutdown); } public void registerListener(Object listener) {