Merge pull request #72 from lenhard/master

Bump pdfbox dependency versions
JabRef · Jul 29, 2015 · b506e1a · b506e1a
2 parents 4b20b50 + 4c3e0d5
commit b506e1a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,5 @@
 [master]
+    - Streamline logging API: Replace usages of java.util.logging with commons.logging
     - "ISBN to BibTeX" fetcher now uses eBook.de's API (fixes bug #1241)
     - Update dependencies: jersey, commons.logging, pdfbox, jgoodies, lazedlists, JDBC connectors
     - Refactored preferences

diff --git a/build.gradle b/build.gradle
@@ -76,9 +76,9 @@ dependencies {
 
     compile 'org.swinglabs:swingx:1.6.1'
 
-    compile 'org.apache.pdfbox:pdfbox:1.8.9'
-    compile 'org.apache.pdfbox:fontbox:1.8.9'
-    compile 'org.apache.pdfbox:jempbox:1.8.9'
+    compile 'org.apache.pdfbox:pdfbox:1.8.10'
+    compile 'org.apache.pdfbox:fontbox:1.8.10'
+    compile 'org.apache.pdfbox:jempbox:1.8.10'
 
     compile 'commons-cli:commons-cli:1.3.1'
 

diff --git a/src/main/java/net/sf/jabref/Globals.java b/src/main/java/net/sf/jabref/Globals.java
@@ -104,13 +104,9 @@ public ResourceBundle newBundle(String baseName, Locale locale,
 
 
     private static int SHORTCUT_MASK = -1;
-    public static final int
-            FUTURE_YEAR = 2050; // Needs to give a year definitely in the future.
-            // Used for guessing the
-            // year field when parsing textual data. :-)
 
-            public static int STANDARD_EXPORT_COUNT = 5; // The number of standard export formats.
-            public static final int METADATA_LINE_LENGTH = 70; // The line length used to wrap metadata.
+    public static int STANDARD_EXPORT_COUNT = 5; // The number of standard export formats.
+    public static final int METADATA_LINE_LENGTH = 70; // The line length used to wrap metadata.
 
     // used at highlighting in preview area. 
     // Color chosen similar to JTextComponent.getSelectionColor(), which is

diff --git a/src/main/java/net/sf/jabref/imports/TextAnalyzer.java b/src/main/java/net/sf/jabref/imports/TextAnalyzer.java
@@ -22,14 +22,17 @@
 import org.apache.commons.logging.LogFactory;
 
 import net.sf.jabref.BibtexEntry;
-import net.sf.jabref.Globals;
 
 class TextAnalyzer {
 
     private final BibtexEntry be = null;
 
     private static final Log LOGGER = LogFactory.getLog(TextAnalyzer.class);
-
+
+    // Needs to give a year definitely in the future.
+    // Used for guessing the
+    // year field when parsing textual data. :-)
+    private static final int FUTURE_YEAR = 2050;
 
     public TextAnalyzer(String text) {
         guessBibtexFields(text);
@@ -72,10 +75,10 @@ private void guessBibtexFields(String text) {
                         yearFound = number;
                     } else {
                         // More than one found. Be a bit more specific.
-                        if ((yearFound < Globals.FUTURE_YEAR) && (number < Globals.FUTURE_YEAR)) {
+                        if ((yearFound < FUTURE_YEAR) && (number < FUTURE_YEAR)) {
                             good = -1;
                             break; // Give up, both seem good enough.
-                        } else if ((yearFound >= Globals.FUTURE_YEAR) && (number < Globals.FUTURE_YEAR)) {
+                        } else if ((yearFound >= FUTURE_YEAR) && (number < FUTURE_YEAR)) {
                             good = i;
                             yearFound = number;
                         }