[tika] branch master updated: TIKA-2429 -- upgrade to POI 3.17, and get it right in tika-eval

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/master by this push:
     new 015c695  TIKA-2429 -- upgrade to POI 3.17, and get it right in tika-eval
015c695 is described below

commit 015c695c7d5a4549c26be247497559d03769f1e4
Author: tballison <ta...@mitre.org>
AuthorDate: Mon Sep 18 10:04:34 2017 -0400

    TIKA-2429 -- upgrade to POI 3.17, and get it right in tika-eval
---
 .../main/java/org/apache/tika/eval/reports/ResultsReporter.java  | 7 +++----
 .../java/org/apache/tika/eval/reports/XLSXHREFFormatter.java     | 9 ++++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java b/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java
index db2a171..11764dd 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java
@@ -39,12 +39,11 @@ import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.poi.common.usermodel.Hyperlink;
+import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.tika.eval.ExtractComparer;
 import org.apache.tika.eval.ExtractProfiler;
 import org.apache.tika.eval.db.H2Util;
 import org.apache.tika.eval.db.JDBCUtil;
-import org.apache.tika.parser.ParseContext;
 import org.apache.tika.utils.XMLReaderUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -182,7 +181,7 @@ public class ResultsReporter {
                 if (baseNode != null) {
                     base = baseNode.getNodeValue();
                 }
-                XLSXHREFFormatter f = new XLSXHREFFormatter(base, Hyperlink.LINK_URL);
+                XLSXHREFFormatter f = new XLSXHREFFormatter(base, HyperlinkType.URL);
                 ret.put(columnName, f);
             } else if ("fileLink".equals(type)) {
                 String base = "";
@@ -190,7 +189,7 @@ public class ResultsReporter {
                 if (baseNode != null) {
                     base = baseNode.getNodeValue();
                 }
-                XLSXHREFFormatter f = new XLSXHREFFormatter(base, Hyperlink.LINK_FILE);
+                XLSXHREFFormatter f = new XLSXHREFFormatter(base, HyperlinkType.FILE);
                 ret.put(columnName, f);
             }
         }
diff --git a/tika-eval/src/main/java/org/apache/tika/eval/reports/XLSXHREFFormatter.java b/tika-eval/src/main/java/org/apache/tika/eval/reports/XLSXHREFFormatter.java
index f8b9ba2..11b72f4 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/reports/XLSXHREFFormatter.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/reports/XLSXHREFFormatter.java
@@ -20,6 +20,7 @@ import java.nio.file.Paths;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Font;
@@ -27,6 +28,8 @@ import org.apache.poi.ss.usermodel.Hyperlink;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
+import javax.swing.event.HyperlinkListener;
+
 
 public class XLSXHREFFormatter implements XSLXCellFormatter {
     //xlsx files can only have this many hyperlinks
@@ -35,15 +38,15 @@ public class XLSXHREFFormatter implements XSLXCellFormatter {
 
 
     private final String urlBase;
-    private final int linkType;
+    private final HyperlinkType linkType;
     private XSSFWorkbook workbook;
     private CellStyle style;
     private int links = 0;
 
     public XLSXHREFFormatter(String urlBase,
-                             int linkType) {
+                             HyperlinkType hyperlinkType) {
         this.urlBase = urlBase;
-        this.linkType = linkType;
+        this.linkType = hyperlinkType;
     }
 
     @Override

-- 
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].