Skip to content

Commit 9f3dd31

Browse files
Egor Martsynkovskyyulian-gaponenko
authored andcommitted
Update AGPL logging with new license mechanism
DEVSIX-5341 Autoported commit. Original commit hash: [fadd155]
1 parent 7cd52f6 commit 9f3dd31

27 files changed

+101
-1880
lines changed

itext.tests/itext.kernel.tests/itext/kernel/VersionTest.cs

Lines changed: 0 additions & 144 deletions
This file was deleted.

itext.tests/itext.kernel.tests/itext/kernel/counter/event/ITextCoreProductEventTest.cs renamed to itext.tests/itext.kernel.tests/itext/kernel/actions/events/ITextCoreProductEventTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ source product.
4747
using iText.Kernel.Actions.Ecosystem;
4848
using iText.Test;
4949

50-
namespace iText.Kernel.Counter.Event {
50+
namespace iText.Kernel.Actions.Events {
5151
public class ITextCoreProductEventTest : ExtendedITextTest {
5252
[NUnit.Framework.Test]
5353
public virtual void OpenDocumentEventTest() {

itext.tests/itext.kernel.tests/itext/kernel/counter/EventCounterHandlerTest.cs

Lines changed: 0 additions & 94 deletions
This file was deleted.

itext.tests/itext.kernel.tests/itext/kernel/pdf/xobject/GetImageBytesTest.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ private void CompareTiffImages(byte[] cmpBytes, byte[] resultBytes) {
254254
TIFFField cmpField = cmpDir.GetField(tag);
255255
TIFFField resultField = resultDir.GetField(tag);
256256
if (tag == TIFFConstants.TIFFTAG_SOFTWARE) {
257-
CompareSoftwareVersion(cmpField, resultField);
258257
}
259258
else {
260259
CompareFields(cmpField, resultField);
@@ -264,14 +263,6 @@ private void CompareTiffImages(byte[] cmpBytes, byte[] resultBytes) {
264263
}
265264
}
266265

267-
private void CompareSoftwareVersion(TIFFField cmpField, TIFFField resultField) {
268-
byte[] versionBytes = resultField.GetAsString(0).GetBytes(System.Text.Encoding.ASCII);
269-
//drop last always zero byte
270-
byte[] versionToCompare = SubArray(versionBytes, 0, versionBytes.Length - 2);
271-
NUnit.Framework.Assert.AreEqual(iText.Kernel.Version.GetInstance().GetVersion().GetBytes(System.Text.Encoding
272-
.ASCII), versionToCompare);
273-
}
274-
275266
private void CompareFields(TIFFField cmpField, TIFFField resultField) {
276267
if (cmpField.GetFieldType() == TIFFField.TIFF_LONG) {
277268
NUnit.Framework.Assert.AreEqual(cmpField.GetAsLongs(), resultField.GetAsLongs());

itext.tests/itext.layout.tests/itext/layout/CanvasTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ source product.
4545
using System.IO;
4646
using iText.Commons.Actions;
4747
using iText.Commons.Actions.Sequence;
48+
using iText.Kernel.Actions.Events;
4849
using iText.Kernel.Colors;
49-
using iText.Kernel.Counter.Event;
5050
using iText.Kernel.Geom;
5151
using iText.Kernel.Pdf;
5252
using iText.Kernel.Pdf.Action;

itext.tests/itext.layout.tests/itext/layout/DocumentTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ You should have received a copy of the GNU Affero General Public License
2525
using iText.Commons.Actions.Sequence;
2626
using iText.IO.Source;
2727
using iText.Kernel;
28-
using iText.Kernel.Counter.Event;
28+
using iText.Kernel.Actions.Events;
2929
using iText.Kernel.Geom;
3030
using iText.Kernel.Pdf;
3131
using iText.Kernel.Pdf.Xobject;

itext.tests/itext.kernel.tests/itext/kernel/counter/StandardOutputEventCounterTest.cs renamed to itext/itext.commons/itext/commons/actions/processors/AbstractITextProductEventProcessor.cs

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,31 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2020
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
*/
23-
using iText.Test;
24-
25-
namespace iText.Kernel.Counter {
26-
public class StandardOutputEventCounterTest : ExtendedITextTest {
27-
[NUnit.Framework.Test]
28-
public virtual void StandardEventCounterFactoryTest() {
29-
StandardOutputEventCounterFactory counterFactory = new StandardOutputEventCounterFactory();
30-
NUnit.Framework.Assert.IsTrue(counterFactory.GetCounter(GetType()) is StandardOutputEventCounter);
23+
using System;
24+
using iText.Commons.Actions;
25+
using iText.Commons.Exceptions;
26+
27+
namespace iText.Commons.Actions.Processors {
28+
public abstract class AbstractITextProductEventProcessor : ITextProductEventProcessor {
29+
private readonly String productName;
30+
31+
public AbstractITextProductEventProcessor(String productName) {
32+
if (productName == null) {
33+
throw new ArgumentException(CommonsExceptionMessageConstant.PRODUCT_NAME_CAN_NOT_BE_NULL);
34+
}
35+
this.productName = productName;
36+
}
37+
38+
public abstract void OnEvent(AbstractProductProcessITextEvent @event);
39+
40+
public abstract String GetUsageType();
41+
42+
public virtual String GetProducer() {
43+
return "iText\u00ae ${usedProducts:P V (T 'version')} \u00a9${copyrightSince}-${copyrightTo} iText Group NV";
44+
}
45+
46+
public virtual String GetProductName() {
47+
return productName;
3148
}
3249
}
3350
}

0 commit comments

Comments
 (0)