From commits-return-15133-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Thu Jul 18 18:02:15 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 5330E18063F for ; Thu, 18 Jul 2019 20:02:15 +0200 (CEST) Received: (qmail 6262 invoked by uid 500); 18 Jul 2019 18:02:14 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 6252 invoked by uid 99); 18 Jul 2019 18:02:14 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jul 2019 18:02:14 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E50503A2772 for ; Thu, 18 Jul 2019 18:02:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1863331 - /pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java Date: Thu, 18 Jul 2019 18:02:13 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190718180213.E50503A2772@svn01-us-west.apache.org> Author: tilman Date: Thu Jul 18 18:02:13 2019 New Revision: 1863331 URL: http://svn.apache.org/viewvc?rev=1863331&view=rev Log: PDFBOX-4071: SonarQube fix Modified: pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java Modified: pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java?rev=1863331&r1=1863330&r2=1863331&view=diff ============================================================================== --- pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java (original) +++ pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java Thu Jul 18 18:02:13 2019 @@ -22,11 +22,12 @@ import java.awt.geom.Rectangle2D; 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 org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -80,7 +81,7 @@ public abstract class PDFStreamEngine private Matrix textMatrix; private Matrix textLineMatrix; - private Stack graphicsStack = new Stack(); + private Deque graphicsStack = new ArrayDeque(); private PDResources resources; private PDPage currentPage; @@ -216,7 +217,7 @@ public abstract class PDFStreamEngine } PDResources parent = pushResources(group); - Stack savedStack = saveGraphicsStack(); + Deque savedStack = saveGraphicsStack(); Matrix parentMatrix = initialMatrix; @@ -262,7 +263,7 @@ public abstract class PDFStreamEngine } PDResources parent = pushResources(charProc); - Stack savedStack = saveGraphicsStack(); + Deque savedStack = saveGraphicsStack(); // replace the CTM with the TRM getGraphicsState().setCurrentTransformationMatrix(textRenderingMatrix); @@ -299,7 +300,7 @@ public abstract class PDFStreamEngine throws IOException { PDResources parent = pushResources(appearance); - Stack savedStack = saveGraphicsStack(); + Deque savedStack = saveGraphicsStack(); PDRectangle bbox = appearance.getBBox(); PDRectangle rect = annotation.getRectangle(); @@ -376,7 +377,7 @@ public abstract class PDFStreamEngine initialMatrix = Matrix.concatenate(initialMatrix, patternMatrix); // save the original graphics state - Stack savedStack = saveGraphicsStack(); + Deque savedStack = saveGraphicsStack(); // save a clean state (new clipping path, line path, etc.) Rectangle2D bbox = tilingPattern.getBBox().transform(patternMatrix).getBounds2D(); @@ -463,7 +464,7 @@ public abstract class PDFStreamEngine private void processStream(PDContentStream contentStream) throws IOException { PDResources parent = pushResources(contentStream); - Stack savedStack = saveGraphicsStack(); + Deque savedStack = saveGraphicsStack(); Matrix parentMatrix = initialMatrix; // transform the CTM using the stream's matrix @@ -622,7 +623,8 @@ public abstract class PDFStreamEngine float tj = ((COSNumber)obj).floatValue(); // calculate the combined displacements - float tx, ty; + float tx; + float ty; if (isVertical) { tx = 0; @@ -739,7 +741,8 @@ public abstract class PDFStreamEngine restoreGraphicsState(); // calculate the combined displacements - float tx, ty; + float tx; + float ty; if (font.isVertical()) { tx = 0; @@ -947,10 +950,10 @@ public abstract class PDFStreamEngine * * @return the saved graphics state stack. */ - protected final Stack saveGraphicsStack() + protected final Deque saveGraphicsStack() { - Stack savedStack = graphicsStack; - graphicsStack = new Stack(); + Deque savedStack = graphicsStack; + graphicsStack = new ArrayDeque(); graphicsStack.add(savedStack.peek().clone()); return savedStack; } @@ -960,7 +963,7 @@ public abstract class PDFStreamEngine * * @param snapshot the graphics state stack to be restored. */ - protected final void restoreGraphicsStack(Stack snapshot) + protected final void restoreGraphicsStack(Deque snapshot) { graphicsStack = snapshot; }