Skip to content

Commit 1f810ef

Browse files
committed
Merge remote-tracking branch 'origin/main' into jdk25
2 parents bf5719b + ca3821a commit 1f810ef

File tree

10 files changed

+73
-39
lines changed

10 files changed

+73
-39
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
105105

106106
### Fixed
107107

108+
- We fixed an issue where search results would show stale entries after deleting entries from search results. [#13984](https://github.com/JabRef/jabref/issues/13984)
108109
- When filename pattern is missing for linked files, pattern handling has been introduced to avoid suggesting meaningless filenames like "-". [#13735](https://github.com/JabRef/jabref/issues/13735)
109-
- We fixed an issue where "Specify Bib(La)TeX" tab was not focused when Bib(La)TeX was in the clipboard [#13597](https://github.com/JabRef/jabref/issues/13597)
110+
- We fixed an issue where "Specify Bib(La)TeX" tab was not focused when Bib(La)TeX was in the clipboard. [#13597](https://github.com/JabRef/jabref/issues/13597)
110111
- We fixed an issue whereby the 'About' dialog was not honouring the user's configured font preferences. [#13558](https://github.com/JabRef/jabref/issues/13558)
111112
- We fixed an issue where the Pagetotal column was sorting the values alphabetically instead of numerically. [#12533](https://github.com/JabRef/jabref/issues/12533)
112113
- We fixed an issue where URLs starting with "www." (without a protocol) in file fields caused an `IllegalArgumentException: URI is not absolute` error. [#12186](https://github.com/JabRef/jabref/issues/12186)
@@ -150,6 +151,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
150151
- We prevented a brief flash of the default JavaFX (Modena) theme on startup. [#13877](https://github.com/JabRef/jabref/pull/13877)
151152
- We fixed an issue where button-bar buttons truncated long text with ellipsis. [#13877](https://github.com/JabRef/jabref/pull/13877)
152153
- We fixed an issue where ignoring of subdirectories via `.gitingore` patterns did not work in the "Find unlinked files dialog". [forum#5425](https://discourse.jabref.org/t/set-list-of-ignored-folders-paths/5425/6)
154+
- We fixed an issue where the "Applications to push entries to" list in the preferences was not sorted alphabetically. [#14058](https://github.com/JabRef/jabref/issues/14058)
153155

154156
### Removed
155157

jabgui/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.jabref.logic.util.OptionalObjectProperty;
2525
import org.jabref.logic.util.TaskExecutor;
2626
import org.jabref.model.database.BibDatabaseContext;
27+
import org.jabref.model.database.event.EntriesRemovedEvent;
2728
import org.jabref.model.entry.BibEntry;
2829
import org.jabref.model.groups.GroupTreeNode;
2930
import org.jabref.model.search.SearchDisplayMode;
@@ -267,5 +268,19 @@ public void listen(IndexAddedOrUpdatedEvent indexAddedOrUpdatedEvent) {
267268
public void listen(IndexStartedEvent indexStartedEvent) {
268269
updateSearchMatches(searchQueryProperty.get());
269270
}
271+
272+
@Subscribe
273+
public void listen(EntriesRemovedEvent removedEntriesEvent) {
274+
// When entries are removed, we need to refresh the search matches
275+
// to ensure the filtered list is properly updated and doesn't show stale entries
276+
BackgroundTask.wrap(() -> {
277+
// Re-run the current search to update the filtered results
278+
if (searchQueryProperty.get().isPresent()) {
279+
setSearchMatches(indexManager.search(searchQueryProperty.get().get()));
280+
} else {
281+
clearSearchMatches();
282+
}
283+
}).onSuccess(result -> FilteredListProxy.refilterListReflection(entriesFiltered)).executeWith(taskExecutor);
284+
}
270285
}
271286
}

jabgui/src/main/java/org/jabref/gui/push/GuiPushToApplications.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
import java.util.ArrayList;
44
import java.util.Collections;
5+
import java.util.Comparator;
56
import java.util.List;
67
import java.util.Optional;
78

89
import org.jabref.gui.DialogService;
10+
import org.jabref.logic.push.PushToApplication;
911
import org.jabref.logic.push.PushToApplicationPreferences;
1012

1113
public class GuiPushToApplications {
@@ -25,13 +27,16 @@ public static List<GuiPushToApplication> getAllGUIApplications(DialogService dia
2527
new GuiPushToLyx(dialogService, preferences),
2628
new GuiPushToSublimeText(dialogService, preferences),
2729
new GuiPushToTexmaker(dialogService, preferences),
30+
new GuiPushToTexShop(dialogService, preferences),
2831
new GuiPushToTeXstudio(dialogService, preferences),
2932
new GuiPushToTeXworks(dialogService, preferences),
3033
new GuiPushToVim(dialogService, preferences),
34+
new GuiPushToVScode(dialogService, preferences),
3135
new GuiPushToWinEdt(dialogService, preferences),
32-
new GuiPushToTexShop(dialogService, preferences),
3336
new GuiPushToVScode(dialogService, preferences)));
3437

38+
APPLICATIONS.sort(Comparator.comparing(PushToApplication::getDisplayName, String.CASE_INSENSITIVE_ORDER));
39+
3540
return Collections.unmodifiableList(APPLICATIONS);
3641
}
3742

jablib/src/main/resources/l10n/JabRef_de.properties

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,6 @@ Open\ one\ before\ citing.=Wählen Sie vor dem Zitieren eine aus.
16881688
Select\ one\ before\ citing.=Wählen Sie vor dem Zitieren eine aus.
16891689
Select\ some\ before\ citing.=Wählen Sie vor dem Zitieren einige aus.
16901690
1691-
Citation\ relations=Zitations-Beziehungen
16921691
Show\ articles\ related\ by\ citation=Artikel anzeigen, die durch Zitate verwandt sind
16931692
Error\ while\ fetching\ citing\ entries\:\ %0=Fehler beim Abrufen von Zitationseinträgen\: %0
16941693
@@ -2095,10 +2094,7 @@ There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ name=Es exist
20952094
20962095
Show\ tab\ 'LaTeX\ citations'=Zeige Reiter 'LaTeX Zitate'
20972096
Show\ tab\ 'Citation\ information'=Zeige Reiter 'Zitierinformationen'
2098-
Search\ scite.ai\ for\ Smart\ Citations=Durchsuche scite.ai nach smarten Referenzen
2099-
See\ full\ report\ at\ [%0]=Vollständigen Bericht unter [%0] ansehen
21002097
No\ active\ entry=Kein aktiver Eintrag
2101-
Tallies\ for\ %0=Anzahl für %0
21022098
21032099
LaTeX\ citations=LaTeX-Zitate
21042100
Search\ for\ citations\ in\ LaTeX\ files...=Suche nach Zitaten in LaTeX Dateien...
@@ -2841,8 +2837,6 @@ Current\ JabRef\ version\:\ %0=Aktuelle JabRef Version\: %0
28412837
Download\ development\ version=Entwicklungsversion herunterladen
28422838
CHANGELOG=Änderungsprotokoll
28432839
Show\ preview\ in\ entry\ table\ tooltip=Vorschau im Tooltip der Eintragstabelle anzeigen
2844-
Citation\ information=Zitierinformationen
2845-
Total\ Citations\:\ %0\nSupporting\:\ %1\nContradicting\:\ %2\nMentioning\:\ %3\nUnclassified\:\ %4\nCiting\ Publications\:\ %5=Gesamtzahl der Zitate\: %0\nUnterstützend\: %1\nWiderspruch\: %2\nErwähnung\: %3\nNicht klassifiziert\: %4\nZitierende Publikationen\: %5
28462840

28472841
Citations\ relations\ local\ storage\ time-to-live\ (in\ days)=Zitier-Beziehungen\: Lokale Speicherung (in Tagen)
28482842

jablib/src/main/resources/l10n/JabRef_es.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,7 +1487,6 @@ Open\ one\ before\ citing.=Abrir uno antes de citar.
14871487
Select\ one\ before\ citing.=Seleccione una antes de citar.
14881488
Select\ some\ before\ citing.=Seleccione algunos antes de citar.
14891489
1490-
Citation\ relations=Relaciones entre citas
14911490
Show\ articles\ related\ by\ citation=Mostrar artículos relacionados por cita
14921491
Error\ while\ fetching\ citing\ entries\:\ %0=Error al recuperar las entradas de cita\: %0
14931492
@@ -1862,8 +1861,6 @@ There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ extension=Ya
18621861
There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ name=Ya existe un tipo de archivo externo con el mismo nombre
18631862
18641863
1865-
Search\ scite.ai\ for\ Smart\ Citations=Buscar citas inteligentes en scite.ai
1866-
See\ full\ report\ at\ [%0]=Vea el informe completo en [%0]
18671864
No\ active\ entry=Ninguna entrada activa
18681865
18691866
Search\ for\ citations\ in\ LaTeX\ files...=Buscar citas en archivos LaTeX...

jablib/src/main/resources/l10n/JabRef_fr.properties

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1727,7 +1727,6 @@ Open\ one\ before\ citing.=Ouvrez-en un avant d'insérer un appel à référence
17271727
Select\ one\ before\ citing.=Sélectionnez-en un avant d'insérer un appel à référence.
17281728
Select\ some\ before\ citing.=Sélectionnez-en au moins un avant d'insérer un appel à référence.
17291729
1730-
Citation\ relations=Relations de citation
17311730
Show\ articles\ related\ by\ citation=Afficher les articles liés par citation
17321731
Error\ while\ fetching\ cited\ entries\:\ %0=Erreur lors de la collecte des entrées citées \: %0
17331732
Error\ while\ fetching\ citing\ entries\:\ %0=Erreur lors de la collecte des entrées citantes \: %0
@@ -2161,10 +2160,8 @@ There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ name=Il exist
21612160
Show\ tab\ 'LaTeX\ citations'=Afficher l'onglet 'Citations LaTeX'
21622161
Show\ tab\ 'File\ annotations'\ only\ if\ it\ contains\ highlights\ or\ comments=Afficher l'onglet 'Annotations de fichiers' uniquement s'il contient des surlignements ou des commentaires
21632162
Show\ tab\ 'Citation\ information'=Afficher l'onglet 'Informations de citation'
2164-
Search\ scite.ai\ for\ Smart\ Citations=Rechercher des Citations Intelligentes dans scite.ai
2165-
See\ full\ report\ at\ [%0]=Voir le rapport complet à [%0]
2163+
See\ full\ report=Voir le rapport complet
21662164
No\ active\ entry=Aucune entrée active
2167-
Tallies\ for\ %0=Décomptes pour %0
21682165
21692166
LaTeX\ citations=Citations LaTeX
21702167
Search\ for\ citations\ in\ LaTeX\ files...=Recherche de citations dans les fichiers LaTeX...
@@ -2966,8 +2963,16 @@ Current\ JabRef\ version\:\ %0=Version actuelle de JabRef \: %0
29662963
Download\ development\ version=Télécharger la version de développement
29672964
CHANGELOG=Journal des modifications
29682965
Show\ preview\ in\ entry\ table\ tooltip=Afficher l'aperçu dans l'infobulle de la table des entrées
2969-
Citation\ information=Information de citation
2970-
Total\ Citations\:\ %0\nSupporting\:\ %1\nContradicting\:\ %2\nMentioning\:\ %3\nUnclassified\:\ %4\nCiting\ Publications\:\ %5=Citations totales \: %0\nSoutien \: %1\nContradictoire \: %2\nMention \: %3\nNon classée \: %4\nPublications citées \: %5
2966+
Total\ Citations\:\ %0=Total des citations \: %0
2967+
Supporting\:\ %0=Soutien \: %0
2968+
Contradicting\:\ %0=Contredit \: %0
2969+
Mentioning\:\ %0=Mentionne \: %0
2970+
Unclassified\:\ %0=Non classé \: %0
2971+
Citing\ Publications\:\ %0=Publications citant \: %0
2972+
Citations=Citations
2973+
Metrics\:=Métriques \:
2974+
Relations\ provided\ by\ Semantic\ Scholar=Relations fournies par le Semantic Scholar
2975+
Metrics\ provided\ by\ scite.ai=Métriques fournies par scite.ai
29712976
29722977
Citations\ relations\ local\ storage\ time-to-live\ (in\ days)=Durée de conservation en local des relations entre citations (en jours)
29732978

jablib/src/main/resources/l10n/JabRef_it.properties

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,7 +1722,6 @@ Open\ one\ before\ citing.=Aprirne uno prima di citare.
17221722
Select\ one\ before\ citing.=Selezionane uno prima di citare.
17231723
Select\ some\ before\ citing.=Selezionare alcuni prima di citare.
17241724

1725-
Citation\ relations=Relazioni di citazione
17261725
Show\ articles\ related\ by\ citation=Mostra articoli correlati per citazione
17271726
Error\ while\ fetching\ cited\ entries\:\ %0=Errore durante il recupero delle voci citate\: %0
17281727
Error\ while\ fetching\ citing\ entries\:\ %0=Errore durante il recupero delle voci citate\: %0
@@ -2156,10 +2155,8 @@ There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ name=Esiste g
21562155
Show\ tab\ 'LaTeX\ citations'=Mostra scheda 'Citazioni LaTeX'
21572156
Show\ tab\ 'File\ annotations'\ only\ if\ it\ contains\ highlights\ or\ comments=Mostra la scheda 'Annotazioni file' solo se contiene evidenziazioni o commenti
21582157
Show\ tab\ 'Citation\ information'=Mostra scheda 'Informazioni sulla citazione'
2159-
Search\ scite.ai\ for\ Smart\ Citations=Cerca scite.ai per Smart Citations
2160-
See\ full\ report\ at\ [%0]=Vedi la relazione completa alla sezione [%0]
2158+
See\ full\ report=Visualizza il rapporto completo
21612159
No\ active\ entry=Nessuna voce attiva
2162-
Tallies\ for\ %0=Conteggi per %0
21632160
21642161
LaTeX\ citations=Citazioni LaTeX
21652162
Search\ for\ citations\ in\ LaTeX\ files...=Cerca citazioni nei file LaTeX...
@@ -2933,8 +2930,16 @@ Current\ JabRef\ version\:\ %0=Versione corrente di JabRef\: %0
29332930
Download\ development\ version=Scarica versione di sviluppo
29342931
CHANGELOG=CHANGELOG
29352932
Show\ preview\ in\ entry\ table\ tooltip=Mostra anteprima nel suggerimento tabella voci
2936-
Citation\ information=Informazioni di citazione
2937-
Total\ Citations\:\ %0\nSupporting\:\ %1\nContradicting\:\ %2\nMentioning\:\ %3\nUnclassified\:\ %4\nCiting\ Publications\:\ %5=Citazioni Totali\: %0\nIn supporto\: %1\nIn contrasto\: %2\nMenzionanti\: %3\nNon classificate\: %4\nCitanti Pubblicazioni\: %5
2933+
Total\ Citations\:\ %0=Totale citazioni\: %0
2934+
Supporting\:\ %0=Supporto\: %0
2935+
Contradicting\:\ %0=Contraddicendo\: %0
2936+
Mentioning\:\ %0=Menzionando\: %0
2937+
Unclassified\:\ %0=Non Classificato\: %0
2938+
Citing\ Publications\:\ %0=Pubblicazioni citanti\: %0
2939+
Citations=Citazioni
2940+
Metrics\:=Metriche\:
2941+
Relations\ provided\ by\ Semantic\ Scholar=Relazioni fornite da Semantic Scholar
2942+
Metrics\ provided\ by\ scite.ai=Metriche fornite da scite.ai
29382943

29392944
Citations\ relations\ local\ storage\ time-to-live\ (in\ days)=Durata di conservazione in locale delle relazioni fra citazioni (in giorni)
29402945

0 commit comments

Comments
 (0)