Author: centic
Date: Sun Sep 17 11:07:48 2017
New Revision: 1808619
URL: http://svn.apache.org/viewvc?rev=1808619&view=rev
Log:
Some more code cleanup
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/CacheAreaEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java
poi/trunk/src/java/org/apache/poi/util/IOUtils.java
poi/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/CacheAreaEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/CacheAreaEval.java?rev=1808619&r1=1808618&r2=1808619&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/CacheAreaEval.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/CacheAreaEval.java Sun Sep 17 11:07:48 2017
@@ -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;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java?rev=1808619&r1=1808618&r2=1808619&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java Sun Sep 17 11:07:48 2017
@@ -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;
/**
Modified: poi/trunk/src/java/org/apache/poi/util/IOUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/IOUtils.java?rev=1808619&r1=1808618&r2=1808619&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/IOUtils.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/IOUtils.java Sun Sep 17 11:07:48 2017
@@ -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);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java?rev=1808619&r1=1808618&r2=1808619&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java Sun Sep 17 11:07:48 2017
@@ -103,7 +103,7 @@ public class POIXMLTypeLoader {
* opposed to being loaded by the factory class which is accompanied by each generated XmlBeans interface.
* <p>
* 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.
* <p>
* 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
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java?rev=1808619&r1=1808618&r2=1808619&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java Sun Sep 17 11:07:48 2017
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org