From ec42ec1053cdd849923bcbc0ad99ec0613a34af5 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Sun, 17 Sep 2017 11:07:48 +0000 Subject: [PATCH] Some more code cleanup git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1808619 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/poi/ss/formula/CacheAreaEval.java | 1 - .../org/apache/poi/ss/formula/eval/OperandResolver.java | 2 +- src/java/org/apache/poi/util/IOUtils.java | 6 ++++++ src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java | 2 +- .../usermodel/TestMatrixFormulasFromXMLSpreadsheet.java | 2 -- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/java/org/apache/poi/ss/formula/CacheAreaEval.java b/src/java/org/apache/poi/ss/formula/CacheAreaEval.java index 1a62248127..50a5e06b0c 100644 --- a/src/java/org/apache/poi/ss/formula/CacheAreaEval.java +++ b/src/java/org/apache/poi/ss/formula/CacheAreaEval.java @@ -17,7 +17,6 @@ package org.apache.poi.ss.formula; -import org.apache.poi.ss.formula.TwoDEval; import org.apache.poi.ss.formula.eval.AreaEval; import org.apache.poi.ss.formula.eval.AreaEvalBase; import org.apache.poi.ss.formula.eval.BlankEval; diff --git a/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java b/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java index 77697f2d8a..72285dca04 100644 --- a/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java +++ b/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java @@ -19,7 +19,7 @@ package org.apache.poi.ss.formula.eval; import org.apache.poi.ss.formula.EvaluationCell; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.ss.formula.eval.ErrorEval; + import java.util.regex.Pattern; /** diff --git a/src/java/org/apache/poi/util/IOUtils.java b/src/java/org/apache/poi/util/IOUtils.java index 5884c9e26a..e21ccaf031 100644 --- a/src/java/org/apache/poi/util/IOUtils.java +++ b/src/java/org/apache/poi/util/IOUtils.java @@ -211,6 +211,7 @@ public final class IOUtils { * @deprecated since 4.0, use try-with-resources, will be removed in 4.2 */ @Deprecated + @Removal(version="4.2") public static void write(POIDocument doc, OutputStream out) throws IOException { try { doc.write(out); @@ -233,6 +234,7 @@ public final class IOUtils { * @deprecated since 4.0, use try-with-resources, will be removed in 4.2 */ @Deprecated + @Removal(version="4.2") public static void write(Workbook doc, OutputStream out) throws IOException { try { doc.write(out); @@ -256,6 +258,7 @@ public final class IOUtils { * @deprecated since 4.0, use try-with-resources, will be removed in 4.2 */ @Deprecated + @Removal(version="4.2") public static void writeAndClose(POIDocument doc, OutputStream out) throws IOException { try { write(doc, out); @@ -278,6 +281,7 @@ public final class IOUtils { * @deprecated since 4.0, use try-with-resources, will be removed in 4.2 */ @Deprecated + @Removal(version="4.2") public static void writeAndClose(POIDocument doc, File out) throws IOException { try { doc.write(out); @@ -299,6 +303,7 @@ public final class IOUtils { * @deprecated since 4.0, use try-with-resources, will be removed in 4.2 */ @Deprecated + @Removal(version="4.2") public static void writeAndClose(POIDocument doc) throws IOException { try { doc.write(); @@ -314,6 +319,7 @@ public final class IOUtils { * @deprecated since 4.0, use try-with-resources, will be removed in 4.2 */ @Deprecated + @Removal(version="4.2") public static void writeAndClose(Workbook doc, OutputStream out) throws IOException { try { doc.write(out); diff --git a/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java b/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java index 0bfdcfd7c1..fa3d608c0a 100644 --- a/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java +++ b/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java @@ -103,7 +103,7 @@ public class POIXMLTypeLoader { * opposed to being loaded by the factory class which is accompanied by each generated XmlBeans interface. *

* This is especially necessary in a context which doesn't guarantee that the current (thread) context - * cassloader has access to all XmlBeans schema definitions (*.xsb) - which is typically in OSGI the case. + * classloader has access to all XmlBeans schema definitions (*.xsb) - which is typically in OSGI the case. *

* The classloader will be only set for the current thread in a {@link ThreadLocal}. Although the * ThreadLocal is implemented via a {@link WeakReference}, it's good style to {@code null} the classloader diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java index 8a88c5f8cd..39e3cb87f6 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java @@ -37,8 +37,6 @@ import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.LocaleUtil; import org.apache.poi.xssf.XSSFTestDataSamples; -import org.apache.poi.xssf.usermodel.XSSFFormulaEvaluator; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; -- 2.39.5