Streamline code for getTabTitle() (#13781)

* Remove double display of library filename

* Minor code improvements

* Final code changes

* Add CHANGELOG.md entry (and fix typo in other line)

* Consistent string

* Fix typo

* fix typo

---------

Co-authored-by: Philip <[email protected]>

Author: koppor

CHANGELOG.md

@@ -110,8 +110,9 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue showing an empty tooltip in maintable. [#11681](https://github.com/JabRef/jabref/issues/11681)
 - We fixed an issue displaying a warning if a file to open is not found. [#13430](https://github.com/JabRef/jabref/pull/13430)
 - We fixed an issue where Document Viewer showed technical exceptions when opening entries with non-PDF files. [#13198](https://github.com/JabRef/jabref/issues/13198)
+- We fixed an issue with double display of the library filename in the tab tooltip in the case of a changed library. [#13781](https://github.com/JabRef/jabref/pull/13781)
 - When creating a library, if you drag a PDF file containing only a single column, the dialog will now automatically close. [#13262](https://github.com/JabRef/jabref/issues/13262)
-- We fixed an issue where the tab showing the fulltext search results would appear blank after switching library. [#13241](https://github.com/JabRef/jabref/issues/13241)
+- We fixed an issue where the tab showing the fulltext search results would appear blank after switching libraries. [#13241](https://github.com/JabRef/jabref/issues/13241)
 - We fixed an issue where "Copy to" was enabled even if no other library was opened. [#13280](https://github.com/JabRef/jabref/pull/13280)
 - We fixed an issue where the groups were still displayed after closing all libraries. [#13382](https://github.com/JabRef/jabref/issues/13382)
 - Enhanced field selection logic in the Merge Entries dialog when fetching from DOI to prefer valid years and entry types. [#12549](https://github.com/JabRef/jabref/issues/12549)

jabgui/src/main/java/org/jabref/gui/LibraryTab.java

@@ -253,14 +253,14 @@ private void initializeComponentsAndListeners(boolean isDummyContext) {
 
         Platform.runLater(() -> {
             EasyBind.subscribe(changedProperty, this::updateTabTitle);
-            stateManager.getOpenDatabases().addListener((ListChangeListener<BibDatabaseContext>) c ->
+            stateManager.getOpenDatabases().addListener((ListChangeListener<BibDatabaseContext>) _ ->
                     updateTabTitle(changedProperty.getValue()));
         });
     }
 
-    private static void addChangedInformation(StringBuilder text, String fileName) {
+    private static void addChangedInformation(StringBuilder text) {
         text.append("\n");
-        text.append(Localization.lang("Library '%0' has changed.", fileName));
+        text.append(Localization.lang("The library has been modified."));
     }
 
     private static void addModeInfo(StringBuilder text, BibDatabaseContext bibDatabaseContext) {
@@ -399,10 +399,10 @@ public void updateTabTitle(boolean isChanged) {
                 tabTitle.append('*');
             }
 
-            // Filename
             Path databasePath = file.get();
-            String fileName = databasePath.getFileName().toString();
-            tabTitle.append(fileName);
+            tabTitle.append(databasePath.getFileName().toString());
+            Optional<String> uniquePathPart = FileUtil.getUniquePathDirectory(stateManager.getAllDatabasePaths(), databasePath);
+            uniquePathPart.ifPresent(part -> tabTitle.append(" \u2013 ").append(part));
             toolTipText.append(databasePath.toAbsolutePath());
 
             if (databaseLocation == DatabaseLocation.SHARED) {
@@ -417,12 +417,8 @@ public void updateTabTitle(boolean isChanged) {
 
             // Changed information (tooltip)
             if (isChanged && !isAutosaveEnabled) {
-                addChangedInformation(toolTipText, fileName);
+                addChangedInformation(toolTipText);
             }
-
-            // Unique path fragment
-            Optional<String> uniquePathPart = FileUtil.getUniquePathDirectory(stateManager.getAllDatabasePaths(), databasePath);
-            uniquePathPart.ifPresent(part -> tabTitle.append(" \u2013 ").append(part));
         } else {
             if (databaseLocation == DatabaseLocation.LOCAL) {
                 tabTitle.append('*');
@@ -433,7 +429,7 @@ public void updateTabTitle(boolean isChanged) {
             }
             addModeInfo(toolTipText, bibDatabaseContext);
             if ((databaseLocation == DatabaseLocation.LOCAL) && bibDatabaseContext.getDatabase().hasEntries()) {
-                addChangedInformation(toolTipText, Localization.lang("untitled"));
+                addChangedInformation(toolTipText);
             }
         }
 
@@ -615,7 +611,7 @@ public boolean requestClose() {
      * Ask if the user really wants to close the given database.
      * Offers to save or discard the changes -- or return to the library
      *
-     * @return <code>true</code> if the user choose to close the database
+     * @return <code>true</code> if the user chooses to close the database
      */
     private boolean confirmClose() {
         // Database could not have been changed, since it is still loading
@@ -637,7 +633,7 @@ private boolean confirmClose() {
 
         Optional<ButtonType> response = dialogService.showCustomButtonDialogAndWait(Alert.AlertType.CONFIRMATION,
                 Localization.lang("Save before closing"),
-                Localization.lang("Library '%0' has changed.", filename),
+                Localization.lang("Library '%0' has been modified.", filename),
                 saveChanges, discardChanges, returnToLibrary);
 
         if (response.isEmpty()) {

jablib/src/main/java/org/jabref/logic/util/io/FileUtil.java

@@ -141,29 +141,24 @@ public static Path addExtension(Path path, String extension) {
         return path.resolveSibling(path.getFileName() + extension);
     }
 
-    /**
-     * Looks for the unique directory, if any, different to the provided paths
-     *
-     * @param paths       List of paths as Strings
-     * @param comparePath The to be tested path
-     */
+    /// Looks for the shortest unique path of the parent directory in the list of paths
+    /// @param paths       List of paths as Strings
+    /// @param comparePath The to be tested path
+    ///
+    /// @return Optional.empty() if the paths are disjoint
     public static Optional<String> getUniquePathDirectory(List<String> paths, Path comparePath) {
-        String fileName = comparePath.getFileName().toString();
-
-        List<String> uniquePathParts = uniquePathSubstrings(paths);
-        return uniquePathParts.stream()
-                              .filter(part -> comparePath.toString().contains(part)
-                                      && !part.equals(fileName) && part.contains(File.separator))
-                              .findFirst()
-                              .map(part -> part.substring(0, part.lastIndexOf(File.separator)));
+        // Difference to getUniquePathFragment: We want the parent directory, so we cut off the last path fragment
+        return getUniquePathFragment(paths, comparePath)
+                .filter(part -> part.contains(File.separator))
+                .map(part -> part.substring(0, part.lastIndexOf(File.separator)));
     }
 
-    /**
-     * Looks for the shortest unique path of the in a list of paths
-     *
-     * @param paths       List of paths as Strings
-     * @param comparePath The to be shortened path
-     */
+    /// Looks for the shortest unique path in the list of paths
+    ///
+    /// @param paths       List of paths as Strings
+    /// @param comparePath The to be shortened path
+    ///
+    /// @return Shortest unique path fragment (if exists) - Optional.empty() if the paths are disjoint
     public static Optional<String> getUniquePathFragment(List<String> paths, Path comparePath) {
         return uniquePathSubstrings(paths).stream()
                                           .filter(part -> comparePath.toString().contains(part))

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

@@ -1419,9 +1419,6 @@ Existing\ entry=Existing entry
 From\ import=From import
 From\ DOI=From DOI
 No\ problems\ found.=No problems found.
-Save\ changes=Save changes
-Discard\ changes=Discard changes
-Library\ '%0'\ has\ changed.=Library '%0' has changed.
 Print\ entry\ preview=Print entry preview
 
 Invalid\ DOI\:\ '%0'.=Invalid DOI: '%0'.
@@ -2106,7 +2103,11 @@ Find\ and\ replace=Find and replace
 Found\ documents\:=Found documents\:
 Use\ selected\ document=Use selected document
 Dismiss\ changes=Dismiss changes
+The\ library\ has\ been\ modified.=The library has been modified.
+Library\ '%0'\ has\ been\ modified.=Library '%0' has been modified.
 The\ library\ has\ been\ modified\ by\ another\ program.=The library has been modified by another program.
+Save\ changes=Save changes
+Discard\ changes=Discard changes
 
 Set\ rank\ to\ one=Set rank to one
 Set\ rank\ to\ two=Set rank to two