You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/04/30 14:58:21 UTC
svn commit: r1877214 - in /pdfbox/trunk:
pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java
xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Author: tilman
Date: Thu Apr 30 14:58:21 2020
New Revision: 1877214
URL: http://svn.apache.org/viewvc?rev=1877214&view=rev
Log:
PDFBOX-4071: SonarQube fix: replace Stack with Deque
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java
pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java?rev=1877214&r1=1877213&r2=1877214&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java Thu Apr 30 14:58:21 2020
@@ -17,11 +17,12 @@
package org.apache.pdfbox.text;
import java.io.IOException;
+import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Stack;
+import java.util.Deque;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
@@ -41,7 +42,7 @@ public class PDFMarkedContentExtractor e
{
private final boolean suppressDuplicateOverlappingText = true;
private final List<PDMarkedContent> markedContents = new ArrayList<>();
- private final Stack<PDMarkedContent> currentMarkedContents = new Stack<>();
+ private final Deque<PDMarkedContent> currentMarkedContents = new ArrayDeque<>();
private final Map<String, List<TextPosition>> characterListMapping = new HashMap<>();
/**
Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java?rev=1877214&r1=1877213&r2=1877214&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java (original)
+++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java Thu Apr 30 14:58:21 2020
@@ -24,11 +24,12 @@ package org.apache.xmpbox.xml;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Stack;
+import java.util.Deque;
import java.util.StringTokenizer;
import javax.xml.XMLConstants;
@@ -894,8 +895,7 @@ public class DomXmpParser
protected static class NamespaceFinder
{
-
- private final Stack<Map<String, String>> stack = new Stack<>();
+ private final Deque<Map<String, String>> stack = new ArrayDeque<>();
protected void push(Element description)
{
@@ -920,16 +920,7 @@ public class DomXmpParser
protected boolean containsNamespace(String namespace)
{
- for (int i = stack.size() - 1; i >= 0; i--)
- {
- Map<String, String> map = stack.get(i);
- if (map.containsValue(namespace))
- {
- return true;
- }
- }
- // else namespace not found
- return false;
+ return stack.stream().anyMatch(map -> map.containsValue(namespace));
}
}