You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/10/03 21:58:42 UTC
svn commit: r1893861 - in /poi/trunk/poi-ooxml/src/main/java/org/apache/poi:
ooxml/extractor/POIXMLExtractorFactory.java
xssf/extractor/XSSFBEventBasedExcelExtractor.java
xwpf/extractor/XWPFWordExtractor.java
Author: fanningpj
Date: Sun Oct 3 21:58:42 2021
New Revision: 1893861
URL: http://svn.apache.org/viewvc?rev=1893861&view=rev
Log:
make array into immutable collection (spotbugs issue)
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java?rev=1893861&r1=1893860&r2=1893861&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java Sun Oct 3 21:58:42 2021
@@ -21,6 +21,9 @@ import static org.apache.poi.extractor.E
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import org.apache.poi.extractor.ExtractorFactory;
import org.apache.poi.extractor.ExtractorProvider;
@@ -65,11 +68,13 @@ public final class POIXMLExtractorFactor
private static final String VISIO_DOCUMENT_REL = PackageRelationshipTypes.VISIO_CORE_DOCUMENT;
private static final String STRICT_DOCUMENT_REL = PackageRelationshipTypes.STRICT_CORE_DOCUMENT;
- private static final XSLFRelation[] SUPPORTED_XSLF_TYPES = new XSLFRelation[]{
- XSLFRelation.MAIN, XSLFRelation.MACRO, XSLFRelation.MACRO_TEMPLATE,
- XSLFRelation.PRESENTATIONML, XSLFRelation.PRESENTATIONML_TEMPLATE,
- XSLFRelation.PRESENTATION_MACRO
- };
+ private static final List<XSLFRelation> SUPPORTED_XSLF_TYPES = Collections.unmodifiableList(
+ Arrays.asList(
+ XSLFRelation.MAIN, XSLFRelation.MACRO, XSLFRelation.MACRO_TEMPLATE,
+ XSLFRelation.PRESENTATIONML, XSLFRelation.PRESENTATIONML_TEMPLATE,
+ XSLFRelation.PRESENTATION_MACRO
+ )
+ );
@Override
public boolean accepts(FileMagic fm) {
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java?rev=1893861&r1=1893860&r2=1893861&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java Sun Oct 3 21:58:42 2021
@@ -18,6 +18,8 @@ package org.apache.poi.xssf.extractor;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collections;
+import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -46,9 +48,9 @@ public class XSSFBEventBasedExcelExtract
private static final Logger LOGGER = LogManager.getLogger(XSSFBEventBasedExcelExtractor.class);
- public static final XSSFRelation[] SUPPORTED_TYPES = new XSSFRelation[]{
+ public static final List<XSSFRelation> SUPPORTED_TYPES = Collections.singletonList(
XSSFRelation.XLSB_BINARY_WORKBOOK
- };
+ );
private boolean handleHyperlinksInCells;
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java?rev=1893861&r1=1893860&r2=1893861&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java Sun Oct 3 21:58:42 2021
@@ -17,6 +17,8 @@
package org.apache.poi.xwpf.extractor;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.poi.ooxml.extractor.POIXMLTextExtractor;
@@ -43,11 +45,14 @@ import org.openxmlformats.schemas.wordpr
* Helper class to extract text from an OOXML Word file
*/
public class XWPFWordExtractor implements POIXMLTextExtractor {
- public static final XWPFRelation[] SUPPORTED_TYPES = {
- XWPFRelation.DOCUMENT, XWPFRelation.TEMPLATE,
- XWPFRelation.MACRO_DOCUMENT,
- XWPFRelation.MACRO_TEMPLATE_DOCUMENT
- };
+ public static final List<XWPFRelation> SUPPORTED_TYPES = Collections.unmodifiableList(
+ Arrays.asList(
+ XWPFRelation.DOCUMENT,
+ XWPFRelation.TEMPLATE,
+ XWPFRelation.MACRO_DOCUMENT,
+ XWPFRelation.MACRO_TEMPLATE_DOCUMENT
+ )
+ );
private final XWPFDocument document;
private boolean fetchHyperlinks;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org