🔖 [RELEASE] Merge branch 'release/1.0.2' into 'master'

DEVSIX-1287, DEVSIX-1289

Author: amedee

pom.xml

@@ -5,37 +5,34 @@
     <parent>
         <groupId>com.itextpdf</groupId>
         <artifactId>root</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.3</version>
         <relativePath />
     </parent>
 
     <artifactId>cleanup</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <name>pdfSweep</name>
     <url>http://itextpdf.com/</url>
 
     <properties>
-        <itext.version>7.0.1</itext.version>
+        <itext.version>${project.parent.version}</itext.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>io</artifactId>
             <version>${itext.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>kernel</artifactId>
             <version>${itext.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>layout</artifactId>
             <version>${itext.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
@@ -79,18 +76,22 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+              	<version>2.19.1</version>
                 <configuration>
                     <groups>${unittests}</groups>
+                  	<argLine>${env.SUREFIRE_OPTS}</argLine>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
+              	<version>2.19.1</version>
                 <configuration>
                     <includes>
                         <include>**/*Test.java</include>
                     </includes>
                     <groups>${integrationtests}</groups>
+                  	<argLine>${env.SUREFIRE_OPTS}</argLine>
                 </configuration>
             </plugin>
             <plugin>
@@ -103,6 +104,23 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${javadoc.version}</version>
+                <configuration>
+                    <subpackages>com.itextpdf.pdfcleanup</subpackages>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpProcessor.java

@@ -59,6 +59,8 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.canvas.CanvasGraphicsState;
 import com.itextpdf.kernel.pdf.canvas.CanvasTag;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvasConstants;
+import com.itextpdf.kernel.pdf.canvas.parser.EventType;
+import com.itextpdf.kernel.pdf.canvas.parser.data.IEventData;
 import com.itextpdf.kernel.pdf.canvas.parser.data.ImageRenderInfo;
 import com.itextpdf.kernel.pdf.canvas.parser.data.PathRenderInfo;
 import com.itextpdf.kernel.pdf.canvas.parser.PdfCanvasProcessor;
@@ -247,6 +249,13 @@ protected static Matrix operandsToMatrix(List<PdfObject> operands) {
         return new Matrix(a, b, c, d, e, f);
     }
 
+    @Override
+    protected void eventOccurred(IEventData data, EventType type) {
+        if (supportedEvents == null || supportedEvents.contains(type)) {
+            eventListener.eventOccurred(data, type);
+        }
+    }
+
     private void writeGsParamsIfFormXObject(String operator, List<PdfObject> operands) {
         if ("Do".equals(operator)) {
             PdfStream formStream = getXObjectStream((PdfName) operands.get(0));

src/main/java/com/itextpdf/pdfcleanup/PdfCleanUpTool.java

@@ -129,21 +129,21 @@ public class PdfCleanUpTool {
      * Use {@link PdfCleanUpTool#addCleanupLocation(PdfCleanUpLocation)} method
      * to set regions to be erased from the document.
      *
-     * @param pdfDocument A{@link com.itextpdf.kernel.pdf.PdfDocument} object representing the document
+     * @param pdfDocument A {@link PdfDocument} object representing the document
      *                    to which redaction applies.
      */
     public PdfCleanUpTool(PdfDocument pdfDocument) {
         this(pdfDocument, false);
     }
 
     /**
-     * Creates a {@link PdfCleanUpTool} object. If {@param cleanRedactAnnotations} is true,
+     * Creates a {@link PdfCleanUpTool} object. If {@code cleanRedactAnnotations} is true,
      * regions to be erased are extracted from the redact annotations contained inside the given document.
-     * Those redact annotations will be removed from the resultant document. If {@param cleanRedactAnnotations} is false,
+     * Those redact annotations will be removed from the resultant document. If {@code cleanRedactAnnotations} is false,
      * then no regions for erasing are specified. In that case use {@link PdfCleanUpTool#addCleanupLocation(PdfCleanUpLocation)}
      * method to set regions to be erased from the document.
      *
-     * @param pdfDocument            A{@link com.itextpdf.kernel.pdf.PdfDocument} object representing the document
+     * @param pdfDocument            A {@link PdfDocument} object representing the document
      *                               to which redaction applies.
      * @param cleanRedactAnnotations if true - regions to be erased are extracted from the redact annotations contained
      *                               inside the given document.
@@ -200,8 +200,8 @@ public PdfCleanUpTool(PdfDocument pdfDocument, boolean cleanRedactAnnotations) {
      * Creates a {@link PdfCleanUpTool} object based on the given {@link java.util.List}
      * of {@link PdfCleanUpLocation}s representing regions to be erased from the document.
      *
-     * @param cleanUpLocations list of locations to be cleaned up {@see PdfCleanUpLocation}
-     * @param pdfDocument      A{@link com.itextpdf.kernel.pdf.PdfDocument} object representing the document
+     * @param cleanUpLocations list of locations to be cleaned up {@link PdfCleanUpLocation}
+     * @param pdfDocument      A {@link PdfDocument} object representing the document
      *                         to which redaction applies.
      */
     public PdfCleanUpTool(PdfDocument pdfDocument, List<PdfCleanUpLocation> cleanUpLocations) {
@@ -284,8 +284,6 @@ private void addColoredRectangle(PdfCanvas canvas, PdfCleanUpLocation location)
     /**
      * Adds clean up locations to be erased by extracting regions from the redact annotations
      * contained inside the given document. Those redact annotations will be removed from the resultant document.
-     *
-     * @return current {@link PdfCleanUpTool} instance.
      */
     private void addCleanUpLocationsBasedOnRedactAnnotations() {
         redactAnnotations = new LinkedHashMap<>();