Skip to content

Commit 79c8b0d

Browse files
Artyom Yanchevskyyulian-gaponenko
authored andcommitted
Unify naming of ProdcutData and ProductEvent classes
DEVSIX-5811
1 parent a9945bf commit 79c8b0d

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

kernel/src/main/java/com/itextpdf/kernel/counter/event/ITextCoreEvent.java renamed to kernel/src/main/java/com/itextpdf/kernel/counter/event/ITextCoreProductEvent.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This file is part of the iText (R) project.
3131
/**
3232
* Class represents events registered in iText core module.
3333
*/
34-
public class ITextCoreEvent extends AbstractProductProcessITextEvent {
34+
public class ITextCoreProductEvent extends AbstractProductProcessITextEvent {
3535
/**
3636
* Process pdf event type.
3737
*/
@@ -48,7 +48,7 @@ public class ITextCoreEvent extends AbstractProductProcessITextEvent {
4848
* @param confirmationType defines when the event should be confirmed to notify that the
4949
* associated process has finished successfully
5050
*/
51-
private ITextCoreEvent(SequenceId sequenceId, IMetaInfo metaInfo, String eventType,
51+
private ITextCoreProductEvent(SequenceId sequenceId, IMetaInfo metaInfo, String eventType,
5252
EventConfirmationType confirmationType) {
5353
super(sequenceId, ITextCoreProductData.getInstance(), metaInfo, confirmationType);
5454
this.eventType = eventType;
@@ -64,9 +64,9 @@ private ITextCoreEvent(SequenceId sequenceId, IMetaInfo metaInfo, String eventTy
6464
*
6565
* @return the process pdf event
6666
*/
67-
public static ITextCoreEvent createProcessPdfEvent(SequenceId sequenceId, IMetaInfo metaInfo,
67+
public static ITextCoreProductEvent createProcessPdfEvent(SequenceId sequenceId, IMetaInfo metaInfo,
6868
EventConfirmationType confirmationType) {
69-
return new ITextCoreEvent(sequenceId, metaInfo, PROCESS_PDF, confirmationType);
69+
return new ITextCoreProductEvent(sequenceId, metaInfo, PROCESS_PDF, confirmationType);
7070
}
7171

7272
@Override

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfDocument.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ This file is part of the iText (R) project.
5959
import com.itextpdf.commons.actions.sequence.SequenceId;
6060
import com.itextpdf.kernel.counter.EventCounterHandler;
6161
import com.itextpdf.kernel.counter.event.CoreEvent;
62-
import com.itextpdf.kernel.counter.event.ITextCoreEvent;
62+
import com.itextpdf.kernel.counter.event.ITextCoreProductEvent;
6363
import com.itextpdf.kernel.crypto.BadPasswordException;
6464
import com.itextpdf.kernel.events.EventDispatcher;
6565
import com.itextpdf.kernel.events.IEventDispatcher;
@@ -1943,7 +1943,7 @@ protected void open(PdfVersion newPdfVersion) {
19431943
this.encryptedEmbeddedStreamsHandler = new EncryptedEmbeddedStreamsHandler(this);
19441944

19451945
try {
1946-
final ITextCoreEvent event = ITextCoreEvent.createProcessPdfEvent(this.getDocumentIdWrapper(),
1946+
final ITextCoreProductEvent event = ITextCoreProductEvent.createProcessPdfEvent(this.getDocumentIdWrapper(),
19471947
properties.metaInfo,
19481948
writer == null ? EventConfirmationType.ON_DEMAND : EventConfirmationType.ON_CLOSE);
19491949
EventManager.getInstance().onEvent(event);

kernel/src/test/java/com/itextpdf/kernel/counter/event/ITextCoreEventTest.java renamed to kernel/src/test/java/com/itextpdf/kernel/counter/event/ITextCoreProductEventTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ This file is part of the iText (R) project.
5555
import org.junit.experimental.categories.Category;
5656

5757
@Category(UnitTest.class)
58-
public class ITextCoreEventTest extends ExtendedITextTest {
58+
public class ITextCoreProductEventTest extends ExtendedITextTest {
5959
@Test
6060
public void openDocumentEventTest() {
6161
SequenceId sequenceId = new SequenceId();
62-
ITextCoreEvent event = ITextCoreEvent.createProcessPdfEvent(sequenceId, new TestMetaInfo("meta data"), EventConfirmationType.ON_CLOSE);
62+
ITextCoreProductEvent event = ITextCoreProductEvent.createProcessPdfEvent(sequenceId, new TestMetaInfo("meta data"), EventConfirmationType.ON_CLOSE);
6363

64-
Assert.assertEquals(ITextCoreEvent.PROCESS_PDF, event.getEventType());
64+
Assert.assertEquals(ITextCoreProductEvent.PROCESS_PDF, event.getEventType());
6565
Assert.assertEquals(ProductNameConstant.ITEXT_CORE, event.getProductName());
6666
Assert.assertEquals(EventConfirmationType.ON_CLOSE, event.getConfirmationType());
6767
Assert.assertEquals(sequenceId, event.getSequenceId());

layout/src/test/java/com/itextpdf/layout/CanvasTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This file is part of the iText (R) project.
4949
import com.itextpdf.commons.actions.sequence.SequenceId;
5050
import com.itextpdf.commons.actions.sequence.SequenceIdManager;
5151
import com.itextpdf.kernel.colors.ColorConstants;
52-
import com.itextpdf.kernel.counter.event.ITextCoreEvent;
52+
import com.itextpdf.kernel.counter.event.ITextCoreProductEvent;
5353
import com.itextpdf.kernel.geom.Rectangle;
5454
import com.itextpdf.kernel.pdf.PdfDocument;
5555
import com.itextpdf.kernel.pdf.PdfPage;
@@ -307,7 +307,7 @@ public void addBlockElemMethodLinkingTest() {
307307
// Second event was linked by adding block element method
308308
Assert.assertEquals(2, events.size());
309309

310-
Assert.assertTrue(events.get(0) instanceof ITextCoreEvent);
310+
Assert.assertTrue(events.get(0) instanceof ITextCoreProductEvent);
311311
Assert.assertTrue(events.get(1) instanceof TestProductEvent);
312312
}
313313
}
@@ -332,7 +332,7 @@ public void addImageElemMethodLinkingTest() {
332332
// Second event was linked by adding block element method
333333
Assert.assertEquals(2, events.size());
334334

335-
Assert.assertTrue(events.get(0) instanceof ITextCoreEvent);
335+
Assert.assertTrue(events.get(0) instanceof ITextCoreProductEvent);
336336
Assert.assertTrue(events.get(1) instanceof TestProductEvent);
337337
}
338338
}

layout/src/test/java/com/itextpdf/layout/DocumentTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This file is part of the iText (R) project.
2929
import com.itextpdf.commons.actions.sequence.AbstractIdentifiableElement;
3030
import com.itextpdf.commons.actions.sequence.SequenceId;
3131
import com.itextpdf.commons.actions.sequence.SequenceIdManager;
32-
import com.itextpdf.kernel.counter.event.ITextCoreEvent;
32+
import com.itextpdf.kernel.counter.event.ITextCoreProductEvent;
3333
import com.itextpdf.kernel.geom.Rectangle;
3434
import com.itextpdf.kernel.pdf.PdfDocument;
3535
import com.itextpdf.kernel.pdf.PdfWriter;
@@ -87,7 +87,7 @@ public void addBlockElemMethodLinkingTest() {
8787
// Second event was linked by adding block element method
8888
Assert.assertEquals(2, events.size());
8989

90-
Assert.assertTrue(events.get(0) instanceof ITextCoreEvent);
90+
Assert.assertTrue(events.get(0) instanceof ITextCoreProductEvent);
9191
Assert.assertTrue(events.get(1) instanceof TestProductEvent);
9292
}
9393
}
@@ -106,7 +106,7 @@ public void addAreaBreakElemMethodLinkingTest() {
106106
doc.getPdfDocument().getDocumentIdWrapper());
107107
Assert.assertEquals(1, events.size());
108108

109-
Assert.assertTrue(events.get(0) instanceof ITextCoreEvent);
109+
Assert.assertTrue(events.get(0) instanceof ITextCoreProductEvent);
110110
}
111111
}
112112

@@ -125,7 +125,7 @@ public void addImageElemMethodLinkingTest() {
125125
// Second event was linked by adding block element
126126
Assert.assertEquals(2, events.size());
127127

128-
Assert.assertTrue(events.get(0) instanceof ITextCoreEvent);
128+
Assert.assertTrue(events.get(0) instanceof ITextCoreProductEvent);
129129
Assert.assertTrue(events.get(1) instanceof TestProductEvent);
130130
}
131131
}

0 commit comments

Comments
 (0)