Merge branch 'release/1.0.2'

pavel-alay · pavel-alay · commit 4c7b9d35a1d6 · 2017-06-07T09:27:02.000+03:00
diff --git a/itext.tests/itext.cleanup.tests/App.config b/itext.tests/itext.cleanup.tests/App.config
diff --git a/itext.tests/itext.cleanup.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.cleanup.tests/Properties/AssemblyInfo.cs
@@ -7,14 +7,16 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("iText Group NV")]
 [assembly: AssemblyProduct("iText")]
-[assembly: AssemblyCopyright ("Copyright (c) 1998-2017 iText Group NV")][assembly: AssemblyTrademark("")]
+[assembly: AssemblyCopyright("Copyright (c) 1998-2017 iText Group NV")]
+[assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
 
 [assembly: Guid("647c862e-d837-4901-8e7b-68f5f8bf8f34")]
 
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyInformationalVersion("1.0.2")]
 
 [assembly: NUnit.Framework.Timeout(300000)]
diff --git a/itext.tests/itext.cleanup.tests/itext/pdfcleanup/BigDocumentCleanUpTest.cs b/itext.tests/itext.cleanup.tests/itext/pdfcleanup/BigDocumentCleanUpTest.cs
@@ -54,11 +54,12 @@ source product.
 namespace iText.PdfCleanup {
     public class BigDocumentCleanUpTest : ExtendedITextTest {
 
-        private static readonly String inputPath = NUnit.Framework.TestContext.CurrentContext.TestDirectory + "/../../resources/itext/pdfcleanup/BigDocumentCleanUpTest/";
+        private static readonly String inputPath = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/pdfcleanup/BigDocumentCleanUpTest/";
 
         private static readonly String outputPath = NUnit.Framework.TestContext.CurrentContext.TestDirectory + "/test/itext/pdfcleanup/BigDocumentCleanUpTest/";
 
-        [NUnit.Framework.TestFixtureSetUp]
+        [NUnit.Framework.OneTimeSetUp]
         public static void Before() {
             CreateOrClearDestinationFolder(outputPath);
         }
diff --git a/itext.tests/itext.cleanup.tests/itext/pdfcleanup/CleanUpTaggedPdfTest.cs b/itext.tests/itext.cleanup.tests/itext/pdfcleanup/CleanUpTaggedPdfTest.cs
@@ -53,11 +53,12 @@ source product.
 namespace iText.PdfCleanup {
     public class CleanUpTaggedPdfTest : ExtendedITextTest {
 
-        private static readonly String inputPath = NUnit.Framework.TestContext.CurrentContext.TestDirectory + "/../../resources/itext/pdfcleanup/CleanUpTaggedPdfTest/";
+        private static readonly String inputPath = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/pdfcleanup/CleanUpTaggedPdfTest/";
 
         private static readonly String outputPath = NUnit.Framework.TestContext.CurrentContext.TestDirectory + "/test/itext/pdfcleanup/CleanUpTaggedPdfTest/";
 
-        [NUnit.Framework.TestFixtureSetUp]
+        [NUnit.Framework.OneTimeSetUp]
         public static void Before() {
             CreateOrClearDestinationFolder(outputPath);
         }
diff --git a/itext.tests/itext.cleanup.tests/itext/pdfcleanup/PdfCleanUpToolTest.cs b/itext.tests/itext.cleanup.tests/itext/pdfcleanup/PdfCleanUpToolTest.cs
@@ -55,11 +55,12 @@ source product.
 namespace iText.PdfCleanup {
     public class PdfCleanUpToolTest : ExtendedITextTest {
 
-        private static readonly String inputPath = NUnit.Framework.TestContext.CurrentContext.TestDirectory + "/../../resources/itext/pdfcleanup/PdfCleanUpToolTest/";
+        private static readonly String inputPath = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/pdfcleanup/PdfCleanUpToolTest/";
 
         private static readonly String outputPath = NUnit.Framework.TestContext.CurrentContext.TestDirectory + "/test/itext/pdfcleanup/PdfCleanUpToolTest/";
 
-        [NUnit.Framework.TestFixtureSetUp]
+        [NUnit.Framework.OneTimeSetUp]
         public static void Before() {
             CreateOrClearDestinationFolder(outputPath);
         }
diff --git a/itext.tests/itext.cleanup.tests/resources/itext/pdfcleanup/PdfCleanUpToolTest/cmp_hello_05.pdf b/itext.tests/itext.cleanup.tests/resources/itext/pdfcleanup/PdfCleanUpToolTest/cmp_hello_05.pdf
diff --git a/itext/itext.cleanup/Properties/AssemblyInfo.cs b/itext/itext.cleanup/Properties/AssemblyInfo.cs
@@ -7,14 +7,16 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("iText Group NV")]
 [assembly: AssemblyProduct("iText")]
-[assembly: AssemblyCopyright ("Copyright (c) 1998-2017 iText Group NV")][assembly: AssemblyTrademark("")]
+[assembly: AssemblyCopyright("Copyright (c) 1998-2017 iText Group NV")]
+[assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
 
 [assembly: Guid("ec333396-8945-4d69-b626-475b4e2ede61")]
 
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyInformationalVersion("1.0.2")]
 
 [assembly: Versions.Attributes.KeyVersion("2.0.4.0")]
diff --git a/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpProcessor.cs b/itext/itext.cleanup/itext/pdfcleanup/PdfCleanUpProcessor.cs
@@ -232,6 +232,12 @@ protected internal static Matrix OperandsToMatrix(IList<PdfObject> operands) {
             return new Matrix(a, b, c, d, e, f);
         }
 
+        protected override void EventOccurred(IEventData data, EventType type) {
+            if (supportedEvents == null || supportedEvents.Contains(type)) {
+                eventListener.EventOccurred(data, type);
+            }
+        }
+
         private void WriteGsParamsIfFormXObject(String @operator, IList<PdfObject> operands) {
             if ("Do".Equals(@operator)) {
                 PdfStream formStream = GetXObjectStream((PdfName)operands[0]);
@@ -313,7 +319,7 @@ private void FilterContent(String @operator, IList<PdfObject> operands) {
                                                 }
                                                 else {
                                                     if (lineStyleOperators.Contains(@operator)) {
-                                                        notAppliedGsParams.Peek().lineStyleOperators[@operator] = new List<PdfObject>(operands);
+                                                        notAppliedGsParams.Peek().lineStyleOperators.Put(@operator, new List<PdfObject>(operands));
                                                     }
                                                     else {
                                                         if ("gs".Equals(@operator)) {
diff --git a/pdfSweep.nuspec b/pdfSweep.nuspec
@@ -13,11 +13,11 @@
     <description>pdfSweep is an iText 7 add-on that allows you to permanently remove or black out sensitive data from your PDF documents.</description>
     <summary></summary>
     <releaseNotes>http://itextpdf.com/itext7release</releaseNotes>
-    <copyright>Copyright (c) 1998-2016 iText Group NV</copyright>
+    <copyright>Copyright (c) 1998-2017 iText Group NV</copyright>
     <language>en-US</language>
     <tags>itext itext7 itextsharp c# .net csharp pdf cleanup pdfsweep</tags>
 	<dependencies>
-      <dependency id="itext7" version="7.0.1.0" />
+      <dependency id="itext7" version="7.0.3" />
     </dependencies>
   </metadata>
   <files>
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-25c21a24335d30803713119bbef97b8dfc44fa49
+a9df7a6ebb6ee80165f860dac82d98ae884ee7d2

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-25c21a24335d30803713119bbef97b8dfc44fa49`
	`1`	`+a9df7a6ebb6ee80165f860dac82d98ae884ee7d2`