moparisthebest
/
poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Some more code cleanup 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1808619 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2017-09-17 11:07:48 +00:00
parent f770381956
commit 75c63b6bbe
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/org/apache/poi/ss/formula/CacheAreaEval.java
View File

@ -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;

2
src/java/org/apache/poi/ss/formula/eval/OperandResolver.java
View File

@ -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;
/**

6
src/java/org/apache/poi/util/IOUtils.java
View File

@ -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);

2
src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
View File

@ -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

2
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
View File

@ -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;