Merge remote-tracking branch 'upstream/master' into libraryproperties…

…tofx * upstream/master: Bump fontbox from 2.0.13 to 2.0.14 (#4705) Bump pdfbox from 2.0.13 to 2.0.14 (#4706) Bump xmpbox from 2.0.13 to 2.0.14 (#4704) Improve parser warnings (#4702) Bump checkstyle from 8.17 to 8.18 (#4700)
JabRef · Mar 1, 2019 · f6564f1 · f6564f1
2 parents 8db78c2 + b041d98
commit f6564f1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -95,9 +95,9 @@ dependencies {
     compile 'com.jgoodies:jgoodies-common:1.8.1'
     compile 'com.jgoodies:jgoodies-forms:1.9.0'
 
-    compile 'org.apache.pdfbox:pdfbox:2.0.13'
-    compile 'org.apache.pdfbox:fontbox:2.0.13'
-    compile 'org.apache.pdfbox:xmpbox:2.0.13'
+    compile 'org.apache.pdfbox:pdfbox:2.0.14'
+    compile 'org.apache.pdfbox:fontbox:2.0.14'
+    compile 'org.apache.pdfbox:xmpbox:2.0.14'
 
     compile group: 'org.apache.tika', name: 'tika-core', version: '1.20'
 
@@ -178,7 +178,7 @@ dependencies {
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:8.17'
+    checkstyle 'com.puppycrawl.tools:checkstyle:8.18'
 }
 
 jacoco {

diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -703,21 +703,21 @@ private String fixKey() throws IOException {
                     }
 
                     // Finished, now reverse newKey and remove whitespaces:
-                    parserResult.addWarning(
-                            Localization.lang("Line %0: Found corrupted BibTeX key.", String.valueOf(line)));
                     key = newKey.reverse();
+                    parserResult.addWarning(
+                            Localization.lang("Line %0: Found corrupted BibTeX key %1.", String.valueOf(line), key.toString()));
                 }
             }
             break;
 
         case ',':
-            parserResult.addWarning(Localization.lang("Line %0: Found corrupted BibTeX key (contains whitespaces).",
-                    String.valueOf(line)));
+            parserResult.addWarning(
+                    Localization.lang("Line %0: Found corrupted BibTeX key %1 (contains whitespaces).", String.valueOf(line), key.toString()));
             break;
 
         case '\n':
             parserResult.addWarning(
-                    Localization.lang("Line %0: Found corrupted BibTeX key (comma missing).", String.valueOf(line)));
+                    Localization.lang("Line %0: Found corrupted BibTeX key %1 (comma missing).", String.valueOf(line), key.toString()));
             break;
 
         default:

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -1160,10 +1160,9 @@ Use\ IEEE\ LaTeX\ abbreviations=Use IEEE LaTeX abbreviations
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=When opening file link, search for matching file if no link is defined
 Settings\ for\ %0=Settings for %0
-
-Line\ %0\:\ Found\ corrupted\ BibTeX\ key.=Line %0: Found corrupted BibTeX key.
-Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (contains\ whitespaces).=Line %0: Found corrupted BibTeX key (contains whitespaces).
-Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ (comma\ missing).=Line %0: Found corrupted BibTeX key (comma missing).
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1.=Line %0: Found corrupted BibTeX key %1.
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1\ (contains\ whitespaces).=Line %0: Found corrupted BibTeX key %1 (contains whitespaces).
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1\ (comma\ missing).=Line %0: Found corrupted BibTeX key %1 (comma missing).
 No\ full\ text\ document\ found=No full text document found
 Update\ to\ current\ column\ order=Update to current column order
 Download\ from\ URL=Download from URL