Skip to content

Commit 6bb3701

Browse files
Fix rebase-related issues and update autopored files
Incorporated changes from rebased branch to recent develop changes (move utils to commons): * PdfTokenizer * GhostscriptHelper * ImageMagickHelperTest * TokeniserTest Incorporated recent changes from develop (logging update): * FlushPdfDocumentEvent * DefaultTypographyApplier * TestConfigurationEvent DEVSIX-5706
1 parent 4830983 commit 6bb3701

File tree

133 files changed

+156
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+156
-150
lines changed

itext.tests/itext.io.tests/itext/io/font/otf/GposLookupType8Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using System.Collections.Generic;
25+
using iText.Commons.Utils;
2526
using iText.IO.Font;
26-
using iText.IO.Util;
2727
using iText.Test;
2828

2929
namespace iText.IO.Font.Otf {

itext.tests/itext.io.tests/itext/io/font/otf/GsubLookupType6Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using System.Collections.Generic;
25+
using iText.Commons.Utils;
2526
using iText.IO.Font;
26-
using iText.IO.Util;
2727
using iText.Test;
2828

2929
namespace iText.IO.Font.Otf {

itext.tests/itext.io.tests/itext/io/util/DateTimeUtilTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ source product.
4141
4242
*/
4343
using System;
44+
using iText.Commons.Utils;
4445
using iText.Test;
4546

4647
namespace iText.IO.Util {

itext.tests/itext.io.tests/itext/io/util/ImageMagickHelperTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ public virtual void CompareEqualsImagesAndCheckFuzzinessTest() {
290290
NUnit.Framework.Assert.IsTrue(result);
291291
NUnit.Framework.Assert.IsTrue(FileUtil.FileExists(diff));
292292
System.Console.Out.Flush();
293-
String output = iText.IO.Util.JavaUtil.GetStringForBytes(baos.ToArray()).Trim();
293+
String output = iText.Commons.Utils.JavaUtil.GetStringForBytes(baos.ToArray()).Trim();
294294
// This check is implemented in such a peculiar way because of .NET autoporting
295295
NUnit.Framework.Assert.AreEqual('0', output[output.Length - 1]);
296296
if (output.Length > 1) {

itext.tests/itext.kernel.tests/itext/kernel/actions/ecosystem/TestConfigurationEvent.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,18 @@ You should have received a copy of the GNU Affero General Public License
2121
along with this program. If not, see <https://www.gnu.org/licenses/>.
2222
*/
2323
using System;
24-
using Common.Logging;
24+
using Microsoft.Extensions.Logging;
2525
using iText.Commons.Actions;
26+
using iText.IO;
2627

2728
namespace iText.Kernel.Actions.Ecosystem {
2829
public class TestConfigurationEvent : AbstractITextConfigurationEvent {
2930
public const String MESSAGE = "Test configuration event was processed";
3031

31-
private static readonly ILog LOGGER = LogManager.GetLogger(typeof(TestConfigurationEvent));
32+
private static readonly ILogger LOGGER = ITextLogManager.GetLogger(typeof(TestConfigurationEvent));
3233

3334
protected override void DoAction() {
34-
LOGGER.Warn(MESSAGE);
35+
LOGGER.LogWarning(MESSAGE);
3536
}
3637
}
3738
}

itext.tests/itext.layout.tests/itext/layout/ListAlignmentDirectionTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ You should have received a copy of the GNU Affero General Public License
2424
using System.Collections.Generic;
2525
using System.IO;
2626
using System.Linq;
27+
using iText.Commons.Utils;
2728
using iText.IO.Util;
2829
using iText.Kernel.Colors;
2930
using iText.Kernel.Pdf;

itext.tests/itext.sign.tests/itext/signatures/CertificateInfoTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using System.Collections.Generic;
25-
using iText.IO.Util;
25+
using iText.Commons.Utils;
2626
using iText.Kernel;
2727
using iText.Test;
2828

itext.tests/itext.sign.tests/itext/signatures/OcspClientBouncyCastleTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ source product.
4545
using Org.BouncyCastle.Crypto;
4646
using Org.BouncyCastle.Ocsp;
4747
using Org.BouncyCastle.X509;
48-
using iText.IO.Util;
48+
using iText.Commons.Utils;
4949
using iText.Signatures.Testutils;
5050
using iText.Signatures.Testutils.Builder;
5151
using iText.Test;

itext.tests/itext.sign.tests/itext/signatures/PdfPKCS7Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ You should have received a copy of the GNU Affero General Public License
2424
using Org.BouncyCastle.Crypto;
2525
using Org.BouncyCastle.Tsp;
2626
using Org.BouncyCastle.X509;
27-
using iText.IO.Util;
27+
using iText.Commons.Utils;
2828
using iText.Kernel;
2929
using iText.Kernel.Pdf;
3030
using iText.Signatures.Exceptions;

itext.tests/itext.sign.tests/itext/signatures/PdfSignatureAppearanceUnitTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ You should have received a copy of the GNU Affero General Public License
2323
using System;
2424
using System.IO;
2525
using Org.BouncyCastle.X509;
26+
using iText.Commons.Utils;
2627
using iText.IO.Image;
27-
using iText.IO.Util;
2828
using iText.Kernel.Colors;
2929
using iText.Kernel.Font;
3030
using iText.Kernel.Geom;

0 commit comments

Comments
 (0)