rename variables, add message if file not resolved

Author: Siedlerchr

src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java

@@ -41,11 +41,9 @@ public void copyFile() {
 
     private void copyFileToDestination(Path exportPath) {
         Optional<Path> fileToExport = linkedFile.findIn(databaseContext, Globals.prefs.getFilePreferences());
-
         Optional<Path> newPath = OptionalUtil.combine(Optional.of(exportPath), fileToExport, resolvePathFilename);
 
         if (newPath.isPresent()) {
-
             Path newFile = newPath.get();
             boolean success = FileUtil.copyFile(fileToExport.get(), newFile, false);
             if (success) {
@@ -55,6 +53,9 @@ private void copyFileToDestination(Path exportPath) {
                 dialogService.showErrorDialogAndWait(Localization.lang("Copy linked file"), Localization.lang("Could not copy file to %0, maybe the file is already existing?", newPath.map(Path::getParent).map(Path::toString).orElse("")));
             }
         }
+        else {
+            dialogService.showErrorDialogAndWait(Localization.lang("Could not resolve the file %0", fileToExport.map(Path::getParent).map(Path::toString).orElse("")));
+        }
 
     }
 }

src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java

@@ -137,7 +137,9 @@ private void addLinkedFileFromURL(URL url, BibEntry entry, Path targetDirectory)
                     basePanel.getBibDatabaseContext(),
                     Globals.TASK_EXECUTOR,
                     dialogService,
-                    JabRefPreferences.getInstance().getXMPPreferences(),JabRefPreferences.getInstance().getFilePreferences(), ExternalFileTypes.getInstance());
+                    JabRefPreferences.getInstance().getXMPPreferences(),
+                    JabRefPreferences.getInstance().getFilePreferences(), 
+                    ExternalFileTypes.getInstance());
 
             try {
                 URLDownload urlDownload = new URLDownload(newLinkedFile.getLink());

src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java

@@ -240,9 +240,9 @@ private ContextMenu createContextMenuForFile(LinkedFileViewModel linkedFile) {
         renameAndMoveFile.setOnAction(event -> linkedFile.moveToDefaultDirectoryAndRename());
         renameAndMoveFile.setDisable(linkedFile.getFile().isOnlineLink() || linkedFile.isGeneratedPathSameAsOriginal());
 
-        MenuItem copyLinkedFiles = new MenuItem(Localization.lang("Copy linked file to folder..."));
-        copyLinkedFiles.setOnAction(event -> new CopySingleFileAction(linkedFile.getFile(), dialogService, databaseContext).copyFile());
-        copyLinkedFiles.setDisable(linkedFile.getFile().isOnlineLink());
+        MenuItem copyLinkedFile = new MenuItem(Localization.lang("Copy linked file to folder..."));
+        copyLinkedFile.setOnAction(event -> new CopySingleFileAction(linkedFile.getFile(), dialogService, databaseContext).copyFile());
+        copyLinkedFile.setDisable(linkedFile.getFile().isOnlineLink());
 
         MenuItem deleteFile = new MenuItem(Localization.lang("Permanently delete local file"));
         deleteFile.setOnAction(event -> viewModel.deleteFile(linkedFile));
@@ -258,7 +258,7 @@ private ContextMenu createContextMenuForFile(LinkedFileViewModel linkedFile) {
         if (linkedFile.getFile().isOnlineLink()) {
             menu.getItems().add(download);
         }
-        menu.getItems().addAll(renameFile, renameFileName, moveFile, renameAndMoveFile, copyLinkedFiles, deleteLink, deleteFile);
+        menu.getItems().addAll(renameFile, renameFileName, moveFile, renameAndMoveFile, copyLinkedFile, deleteLink, deleteFile);
 
         return menu;
     }

src/main/resources/l10n/JabRef_en.properties

@@ -1898,6 +1898,8 @@ Copy\ linked\ file=Copy linked file
 Copy\ linked\ file\ to\ folder...=Copy linked file to folder...
 Could\ not\ copy\ file\ to\ %0,\ maybe\ the\ file\ is\ already\ existing?=Could not copy file to %0, maybe the file is already existing?
 Sucessfully\ copied\ file\ to\ %0=Sucessfully copied file to %0
+Could\ not\ resolve\ the\ file\ %0=Could not resolve the file %0
+
 
 Copy\ linked\ files\ to\ folder...=Copy linked files to folder...
 Copied\ file\ successfully=Copied file successfully