From fd4410d50bffb31c3883206ee2f4da3076b58fd4 Mon Sep 17 00:00:00 2001 From: Axel Howind Date: Thu, 20 Feb 2020 16:27:19 +0000 Subject: [PATCH] replace some calls to Collection methods with shorter/more effective versions git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1874263 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java | 4 ++-- src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java | 2 +- src/java/org/apache/poi/poifs/property/Property.java | 2 +- .../apache/poi/openxml4j/opc/internal/ContentTypeManager.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java b/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java index e43029d459..05881561b1 100644 --- a/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java +++ b/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java @@ -17,7 +17,7 @@ package org.apache.poi.poifs.filesystem; -import static java.util.Collections.emptyList; +import static java.util.Collections.emptyIterator; import java.io.BufferedInputStream; import java.io.IOException; @@ -235,7 +235,7 @@ public final class POIFSDocument implements POIFSViewable, Iterable * store */ public Iterator getViewableIterator() { - return emptyList().iterator(); + return emptyIterator(); } /** diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java b/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java index 12e408ee63..23d9b3e2b0 100644 --- a/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java +++ b/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java @@ -858,7 +858,7 @@ public class POIFSFileSystem extends BlockStore return getRoot().getViewableIterator(); } - return Collections.emptyList().iterator(); + return Collections.emptyIterator(); } /** diff --git a/src/java/org/apache/poi/poifs/property/Property.java b/src/java/org/apache/poi/poifs/property/Property.java index 59727a3584..a994ff133b 100644 --- a/src/java/org/apache/poi/poifs/property/Property.java +++ b/src/java/org/apache/poi/poifs/property/Property.java @@ -500,7 +500,7 @@ public abstract class Property implements Child, POIFSViewable { */ public Iterator getViewableIterator() { - return Collections.emptyList().iterator(); + return Collections.emptyIterator(); } /** diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java index 4ca6189955..5b356843c8 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java @@ -286,8 +286,8 @@ public abstract class ContentTypeManager { throw new IllegalArgumentException("contentType"); } - return (this.defaultContentType.values().contains(contentType) || (this.overrideContentType != null && this.overrideContentType - .values().contains(contentType))); + return (this.defaultContentType.containsValue(contentType) || + (this.overrideContentType != null && this.overrideContentType.containsValue(contentType))); } /**