From ec4942ded1163147e47f9ecf9954e6b23bf3462b Mon Sep 17 00:00:00 2001
From: Felipe <felipeminorelli@gmail.com>
Date: Tue, 9 Jul 2019 15:16:28 -0300
Subject: [PATCH] =?UTF-8?q?Resolu=C3=A7=C3=A3o=20das=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gui/externalfiles/FindFullTextAction.java | 29 ++++++++++++-------
 .../model/entry/BiblatexEntryTypes.java       |  2 +-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
index 90720aa0e7c..9f80ae9b95c 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Path;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -96,18 +97,24 @@ public void update() {
                 DownloadExternalFile fileDownload = new DownloadExternalFile(basePanel.frame(),
                         basePanel.getBibDatabaseContext(), entry);
                 try {
-                    fileDownload.download(result.get(), "application/pdf", file -> {
-                        DefaultTaskExecutor.runInJavaFXThread(() -> {
-                            Optional<FieldChange> fieldChange = entry.addFile(file);
-                            if (fieldChange.isPresent()) {
-                                UndoableFieldChange edit = new UndoableFieldChange(entry, FieldName.FILE,
-                                        entry.getField(FieldName.FILE).orElse(null), fieldChange.get().getNewValue());
-                                basePanel.getUndoManager().addEdit(edit);
-                                basePanel.markBaseChanged();
-                            }
-                        });
+ 		    String str = dir.toString() + entry.getField(FieldName.FILE);
+                    File f = new File(str);
+                    if (f.isFile()) {
+                        return;
+                    } else {
+		            fileDownload.download(result.get(), "application/pdf", file -> {
+		                DefaultTaskExecutor.runInJavaFXThread(() -> {
+		                    Optional<FieldChange> fieldChange = entry.addFile(file);
+		                    if (fieldChange.isPresent()) {
+		                        UndoableFieldChange edit = new UndoableFieldChange(entry, FieldName.FILE,
+		                                entry.getField(FieldName.FILE).orElse(null), fieldChange.get().getNewValue());
+		                        basePanel.getUndoManager().addEdit(edit);
+		                        basePanel.markBaseChanged();
+		                   }
+		                });
 
-                    });
+                              });
+		    }
                 } catch (IOException e) {
                     LOGGER.warn("Problem downloading file", e);
                     basePanel.output(Localization.lang("Full text document download failed for entry %0",
diff --git a/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java b/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java
index a73f39fcf50..7ddc93076ed 100644
--- a/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java
+++ b/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java
@@ -22,7 +22,7 @@ public class BiblatexEntryTypes {
 
         {
             addAllRequired(FieldName.AUTHOR, FieldName.TITLE,
-                    FieldName.orFields(FieldName.JOURNAL, FieldName.JOURNALTITLE),
+                    FieldName.orFields(FieldName.JOURNALTITLE),
                     FieldName.orFields(FieldName.YEAR, FieldName.DATE));
             addAllOptional(FieldName.TRANSLATOR, FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.SUBTITLE,
                     FieldName.TITLEADDON, FieldName.EDITOR, FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC,