Merge branch 'release_branch_DEVSIX-5576' into master-rc

pom.xml

@@ -5,12 +5,12 @@
  <parent>
  <groupId>com.itextpdf</groupId>
  <artifactId>root</artifactId>
- <version>7.1.16</version>
+ <version>7.2.0</version>
  <relativePath />
  </parent>
 
  <artifactId>cleanup</artifactId>
- <version>2.0.7</version>
+ <version>3.0.0</version>
 
  <name>pdfSweep</name>
  <description>Redact PDF documents. If you have to share PDFs with different departments or send them out of house, but they
@@ -102,12 +102,6 @@
  <plugins>
  <plugin>
  <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <sourceFileExcludes>
- <!-- ProductInfo -->
- <sourceFileExclude>**/PdfCleanupProductInfo.java</sourceFileExclude>
- </sourceFileExcludes>
- </configuration>
  </plugin>
  </plugins>
  </build>

src/main/java/com/itextpdf/pdfcleanup/PdfCleanupProductInfo.java → src/main/java/com/itextpdf/pdfcleanup/CleanUpProperties.java

@@ -1,16 +1,16 @@
 /*
  This file is part of the iText (R) project.
  Copyright (c) 1998-2021 iText Group NV
- Authors: Bruno Lowagie, Paulo Soares, et al.
- 
+ Authors: iText Software.
+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License version 3
  as published by the Free Software Foundation with the addition of the
  following permission added to Section 15 as permitted in Section 7(a):
  FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
  ITEXT GROUP. ITEXT GROUP DISCLAIMS THE WARRANTY OF NON INFRINGEMENT
  OF THIRD PARTY RIGHTS
- 
+
  This program is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  or FITNESS FOR A PARTICULAR PURPOSE.
@@ -20,41 +20,80 @@ This file is part of the iText (R) project.
  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA, 02110-1301 USA, or download the license from the following URL:
  http://itextpdf.com/terms-of-use/
- 
+
  The interactive user interfaces in modified source and object code versions
  of this program must display Appropriate Legal Notices, as required under
  Section 5 of the GNU Affero General Public License.
- 
+
  In accordance with Section 7(b) of the GNU Affero General Public License,
  a covered work must retain the producer line in every PDF that is created
  or manipulated using iText.
- 
+
  You can be released from the requirements of the license by purchasing
  a commercial license. Buying such a license is mandatory as soon as you
  develop commercial activities involving the iText software without
  disclosing the source code of your own applications.
  These activities include: offering paid services to customers as an ASP,
  serving PDFs on the fly in a web application, shipping iText with a closed
  source product.
- 
+
  For more information, please contact iText Software Corp. at this
  address: sales@itextpdf.com
  */
-
 package com.itextpdf.pdfcleanup;
 
+import com.itextpdf.commons.actions.contexts.IMetaInfo;
+
 /**
- * Product info about this iText add-on.
+ * Contains properties for {@link PdfCleanUpTool} operations.
  */
-// TODO refactor? move to local fields in order to hide it?
-public class PdfCleanupProductInfo {
-
- /** The product name. */
- public static final String PRODUCT_NAME = "pdfSweep";
-
- /** The major version number. */
- public static final int MAJOR_VERSION = 2;
-
- /** The minor version number. */
- public static final int MINOR_VERSION = 0;
+public class CleanUpProperties {
+
+ private IMetaInfo metaInfo;
+ private boolean processAnnotations;
+
+ /**
+ * Creates default CleanUpProperties instance.
+ */
+ public CleanUpProperties() {
+ processAnnotations = true;
+ }
+
+ /**
+ * Returns metaInfo property.
+ *
+ * @return metaInfo property
+ */
+ IMetaInfo getMetaInfo() {
+ return metaInfo;
+ }
+
+ /**
+ * Sets additional meta info.
+ *
+ * @param metaInfo the meta info to set
+ */
+ public void setMetaInfo(IMetaInfo metaInfo) {
+ this.metaInfo = metaInfo;
+ }
+
+ /**
+ * Check if page annotations will be processed.
+ * Default: {@code true}.
+ *
+ * @return {@code true} if annotations will be processed by the {@link PdfCleanUpTool}
+ */
+ public boolean isProcessAnnotations() {
+ return processAnnotations;
+ }
+
+ /**
+ * Set if page annotations will be processed.
+ * Default processing behaviour: remove annotation if there is overlap with a redaction region.
+ *
+ * @param processAnnotations is page annotations will be processed
+ */
+ public void setProcessAnnotations(boolean processAnnotations) {
+ this.processAnnotations = processAnnotations;
+ }
 }

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

@@ -43,7 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.pdfcleanup;
 
 
-import com.itextpdf.kernel.PdfException;
+import com.itextpdf.kernel.exceptions.PdfException;
 import com.itextpdf.kernel.pdf.canvas.parser.data.IEventData;
 import com.itextpdf.kernel.pdf.canvas.parser.listener.IEventListener;
 import com.itextpdf.kernel.pdf.canvas.parser.EventType;