[RELEASE] Merge branch 'release/2.0.2'

iText-CI · pavel-alay · commit 977acda0b95a · 2018-07-27T15:37:25.000+03:00
diff --git a/itext.tests/itext.cleanup.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.cleanup.tests/Properties/AssemblyInfo.cs
@@ -15,8 +15,8 @@
 
 [assembly: Guid("647c862e-d837-4901-8e7b-68f5f8bf8f34")]
 
-[assembly: AssemblyVersion("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
-[assembly: AssemblyInformationalVersion("2.0.1")]
+[assembly: AssemblyVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyInformationalVersion("2.0.2")]
 
 [assembly: NUnit.Framework.Timeout(300000)]
diff --git a/itext.tests/itext.cleanup.tests/itext.cleanup.tests.csproj b/itext.tests/itext.cleanup.tests/itext.cleanup.tests.csproj
@@ -36,8 +36,8 @@
     <AssemblyOriginatorKeyFile>itext.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\NUnit.3.4.1\lib\net40\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/itext.tests/itext.cleanup.tests/itext/pdfcleanup/BigDocumentAutoCleanUpTest.cs b/itext.tests/itext.cleanup.tests/itext/pdfcleanup/BigDocumentAutoCleanUpTest.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
@@ -141,6 +141,23 @@ public virtual void RedactIPhoneUserManual() {
             CompareResults(cmp, output, outputPath, "diff_redactIPhoneUserManual_");
         }
 
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void RedactIPhoneUserManualColored() {
+            String input = inputPath + "iphone_user_guide_untagged_small.pdf";
+            String output = outputPath + "redactIPhoneUserManualColored.pdf";
+            String cmp = inputPath + "cmp_redactIPhoneUserManualColored.pdf";
+            CompositeCleanupStrategy strategy = new CompositeCleanupStrategy();
+            strategy.Add(new RegexBasedCleanupStrategy("(iphone)|(iPhone)").SetRedactionColor(ColorConstants.GREEN));
+            PdfDocument pdf = new PdfDocument(new PdfReader(input), new PdfWriter(output));
+            // sweep
+            PdfAutoSweep autoSweep = new PdfAutoSweep(strategy);
+            autoSweep.CleanUp(pdf);
+            pdf.Close();
+            CompareResults(cmp, output, outputPath, "diff_redactIPhoneUserManualColored_");
+        }
+
         /// <exception cref="System.IO.IOException"/>
         /// <exception cref="System.Exception"/>
         private void CompareResults(String cmp, String output, String targetDir, String diffPrefix) {
diff --git a/itext.tests/itext.cleanup.tests/itext/pdfcleanup/BigDocumentCleanUpTest.cs b/itext.tests/itext.cleanup.tests/itext/pdfcleanup/BigDocumentCleanUpTest.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext.tests/itext.cleanup.tests/itext/pdfcleanup/CleanUpAnnotationTest.cs b/itext.tests/itext.cleanup.tests/itext/pdfcleanup/CleanUpAnnotationTest.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext.tests/itext.cleanup.tests/itext/pdfcleanup/CleanUpTaggedPdfTest.cs b/itext.tests/itext.cleanup.tests/itext/pdfcleanup/CleanUpTaggedPdfTest.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext.tests/itext.cleanup.tests/itext/pdfcleanup/FilteredImagesCacheTest.cs b/itext.tests/itext.cleanup.tests/itext/pdfcleanup/FilteredImagesCacheTest.cs
@@ -1,3 +1,45 @@
+/*
+This file is part of the iText (R) project.
+Copyright (c) 1998-2018 iText Group NV
+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.
+See the GNU Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, see http://www.gnu.org/licenses or write to
+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
+*/
 using System;
 using System.Collections.Generic;
 using iText.Kernel.Geom;
diff --git a/itext.tests/itext.cleanup.tests/itext/pdfcleanup/PdfCleanUpToolTest.cs b/itext.tests/itext.cleanup.tests/itext/pdfcleanup/PdfCleanUpToolTest.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext.tests/itext.cleanup.tests/itext/pdfcleanup/PdfCleanUpToolWithInlineImagesTest.cs b/itext.tests/itext.cleanup.tests/itext/pdfcleanup/PdfCleanUpToolWithInlineImagesTest.cs
@@ -1,6 +1,6 @@
 /*
     This file is part of the iText (R) project.
-    Copyright (c) 1998-2017 iText Group NV
+    Copyright (c) 1998-2018 iText Group NV
     Authors: iText Software.
 
     This program is free software; you can redistribute it and/or modify
diff --git a/itext.tests/itext.cleanup.tests/packages.config b/itext.tests/itext.cleanup.tests/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.4.1" targetFramework="net40" />
+  <package id="NUnit" version="3.7.1" targetFramework="net40" />
 </packages>
diff --git a/itext.tests/itext.cleanup.tests/resources/itext/pdfcleanup/BigDocumentAutoCleanUpTest/cmp_redactIPhoneUserManualColored.pdf b/itext.tests/itext.cleanup.tests/resources/itext/pdfcleanup/BigDocumentAutoCleanUpTest/cmp_redactIPhoneUserManualColored.pdf
diff --git a/itext.tests/itext.cleanup.tests/resources/itext/pdfcleanup/BigDocumentAutoCleanUpTest/iphone_user_guide_untagged_small.pdf b/itext.tests/itext.cleanup.tests/resources/itext/pdfcleanup/BigDocumentAutoCleanUpTest/iphone_user_guide_untagged_small.pdf
diff --git a/itext/itext.cleanup/Properties/AssemblyInfo.cs b/itext/itext.cleanup/Properties/AssemblyInfo.cs
@@ -21,8 +21,8 @@
 
 [assembly: Guid("ec333396-8945-4d69-b626-475b4e2ede61")]
 
-[assembly: AssemblyVersion("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
-[assembly: AssemblyInformationalVersion("2.0.1")]
+[assembly: AssemblyVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]
+[assembly: AssemblyInformationalVersion("2.0.2")]
 
-[assembly: Versions.Attributes.KeyVersion("3.0.2.0")]
+[assembly: Versions.Attributes.KeyVersion("3.0.3.0")]
diff --git a/itext/itext.cleanup/Properties/KeyVersionAttribute.cs b/itext/itext.cleanup/Properties/KeyVersionAttribute.cs
@@ -1,6 +1,6 @@
 /*
     This file is part of the iText (R) project.
-    Copyright (c) 1998-2017 iText Group NV
+    Copyright (c) 1998-2018 iText Group NV
     Authors: iText Software.
 
     This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/CleanUpExtensions.cs b/itext/itext.cleanup/itext/pdfcleanup/CleanUpExtensions.cs
@@ -1,7 +1,7 @@
 /*
 
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: Bruno Lowagie, Paulo Soares, et al.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/FilteredImagesCache.cs b/itext/itext.cleanup/itext/pdfcleanup/FilteredImagesCache.cs
@@ -1,3 +1,45 @@
+/*
+This file is part of the iText (R) project.
+Copyright (c) 1998-2018 iText Group NV
+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.
+See the GNU Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, see http://www.gnu.org/licenses or write to
+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
+*/
 using System.Collections.Generic;
 using iText.IO.Util;
 using iText.Kernel.Geom;
diff --git a/itext/itext.cleanup/itext/pdfcleanup/LineDashPattern.cs b/itext/itext.cleanup/itext/pdfcleanup/LineDashPattern.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpEventListener.cs b/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpEventListener.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpFilter.cs b/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpFilter.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpLocation.cs b/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpLocation.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpProcessor.cs b/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpProcessor.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpTool.cs b/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpTool.cs
@@ -60,6 +60,9 @@ source product.
 using iText.Layout.Layout;
 using iText.Layout.Properties;
 using Common.Logging;
+using iText.Kernel.Counter;
+using iText.Kernel.Counter.Event;
+using iText.PdfCleanup.Events;
 using Versions.Attributes;
 
 namespace iText.PdfCleanup {
@@ -89,6 +92,8 @@ public class PdfCleanUpTool {
 
         private bool processAnnotations;
 
+        private IMetaInfo cleanupMetaInfo;
+
         /// <summary>Key - page number, value - list of locations related to the page.</summary>
         private IDictionary<int, IList<PdfCleanUpLocation>> pdfCleanUpLocations;
 
@@ -100,12 +105,6 @@ public class PdfCleanUpTool {
 
         private FilteredImagesCache filteredImagesCache;
 
-        private const String PRODUCT_NAME = "pdfSweep";
-
-        private const int PRODUCT_MAJOR = 1;
-
-        private const int PRODUCT_MINOR = 0;
-
         /// <summary>
         /// Creates a
         /// <see cref="PdfCleanUpTool"/>
@@ -163,7 +162,13 @@ public PdfCleanUpTool(PdfDocument pdfDocument, bool cleanRedactAnnotations) {
                     Type licenseKeyProductClass = GetClass(licenseKeyProductClassName);
                     Type licenseKeyProductFeatureClass = GetClass(licenseKeyFeatureClassName);
                     Array array = Array.CreateInstance(licenseKeyProductFeatureClass, 0);
-                    object[] objects = new object[] { "pdfSweep", 1, 0, array };
+                    object[] objects = new object[]
+                    {
+                        PdfCleanupProductInfo.PRODUCT_NAME,
+                        PdfCleanupProductInfo.MAJOR_VERSION,
+                        PdfCleanupProductInfo.MINOR_VERSION,
+                        array
+                    };
                     Object productObject = System.Activator.CreateInstance(licenseKeyProductClass, objects);
                     MethodInfo m = licenseKeyClass.GetMethod(checkLicenseKeyMethodName);
                     m.Invoke(System.Activator.CreateInstance(licenseKeyClass), new object[] {productObject});
@@ -265,6 +270,17 @@ public virtual iText.PdfCleanup.PdfCleanUpTool AddCleanupLocation(PdfCleanUpLoca
             return this;
         }
 
+        /// <summary>
+        /// Sets the cleanup meta info that will be passed to the <see cref="EventCounter"/>
+        /// with <see cref="PdfSweepEvent"/> and can be used to determine event origin.
+        /// <param name="metaInfo">the meta info to set.</param>
+        /// <returns>this instance</returns>
+        /// </summary>
+        public PdfCleanUpTool SetEventCountingMetaInfo(IMetaInfo metaInfo) {
+            this.cleanupMetaInfo = metaInfo;
+            return this;
+        }
+
         /// <summary>
         /// Cleans the document by erasing all the areas which are either provided or
         /// extracted from redaction annotations.
@@ -280,6 +296,7 @@ public virtual void CleanUp() {
             }
             
             pdfCleanUpLocations.Clear();
+            EventCounterHandler.GetInstance().OnEvent(PdfSweepEvent.CLEANUP, cleanupMetaInfo, GetType());
         }
 
         /// <summary>
diff --git a/itext/itext.cleanup/itext/pdfcleanup/PdfCleanupProductInfo.cs b/itext/itext.cleanup/itext/pdfcleanup/PdfCleanupProductInfo.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: Bruno Lowagie, Paulo Soares, et al.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/TextPositioning.cs b/itext/itext.cleanup/itext/pdfcleanup/TextPositioning.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/autosweep/CommonRegex.cs b/itext/itext.cleanup/itext/pdfcleanup/autosweep/CommonRegex.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/autosweep/CompositeCleanupStrategy.cs b/itext/itext.cleanup/itext/pdfcleanup/autosweep/CompositeCleanupStrategy.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/autosweep/ICleanupStrategy.cs b/itext/itext.cleanup/itext/pdfcleanup/autosweep/ICleanupStrategy.cs
@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
diff --git a/itext/itext.cleanup/itext/pdfcleanup/autosweep/PdfAutoSweep.cs b/itext/itext.cleanup/itext/pdfcleanup/autosweep/PdfAutoSweep.cs
diff --git a/itext/itext.cleanup/itext/pdfcleanup/autosweep/RegexBasedCleanupStrategy.cs b/itext/itext.cleanup/itext/pdfcleanup/autosweep/RegexBasedCleanupStrategy.cs
diff --git a/itext/itext.cleanup/itext/pdfcleanup/events/PdfSweepEvent.cs b/itext/itext.cleanup/itext/pdfcleanup/events/PdfSweepEvent.cs
diff --git a/pdfSweep.nuspec b/pdfSweep.nuspec
diff --git a/port-hash b/port-hash
