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:09 UTC
svn commit: r1877212 - in /pdfbox/branches/2.0:
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:09 2020
New Revision: 1877212
URL: http://svn.apache.org/viewvc?rev=1877212&view=rev
Log:
PDFBOX-4071: SonarQube fix: replace Stack with Deque
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java?rev=1877212&r1=1877211&r2=1877212&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java Thu Apr 30 14:58:09 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<PDMarkedContent>();
- private final Stack<PDMarkedContent> currentMarkedContents = new Stack<PDMarkedContent>();
+ private final Deque<PDMarkedContent> currentMarkedContents = new ArrayDeque<PDMarkedContent>();
private final Map<String, List<TextPosition>> characterListMapping = new HashMap<String, List<TextPosition>>();
/**
Modified: pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java?rev=1877212&r1=1877211&r2=1877212&view=diff
==============================================================================
--- pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java (original)
+++ pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java Thu Apr 30 14:58:09 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.Deque;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Stack;
import java.util.StringTokenizer;
import javax.xml.XMLConstants;
@@ -901,8 +902,7 @@ public class DomXmpParser
protected static class NamespaceFinder
{
-
- private final Stack<Map<String, String>> stack = new Stack<Map<String, String>>();
+ private final Deque<Map<String, String>> stack = new ArrayDeque<Map<String, String>>();
protected void push(Element description)
{
@@ -927,9 +927,8 @@ public class DomXmpParser
protected boolean containsNamespace(String namespace)
{
- for (int i = stack.size() - 1; i >= 0; i--)
+ for (Map<String,String> map : stack)
{
- Map<String, String> map = stack.get(i);
if (map.containsValue(namespace))
{
return true;