Refactor com.itextpdf.kernel.events mechanism

DEVSIX-5041

Author: AnhelinaM

commons/src/main/java/com/itextpdf/commons/actions/EventManager.java

@@ -44,7 +44,7 @@ private EventManager() {
     }
 
     /**
-     * Allows an access to the instance of EventManager.
+     * Allows access to the instance of EventManager.
      *
      * @return the instance of the class
      */

commons/src/main/java/com/itextpdf/commons/actions/IEvent.java

@@ -24,7 +24,6 @@ This file is part of the iText (R) project.
 
 /**
  * Base marker interface for any generated event of any source.
- *
  */
 public interface IEvent {
 }

kernel/src/main/java/com/itextpdf/kernel/events/EventDispatcher.java

@@ -25,9 +25,9 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.source.IRandomAccessSource;
 import com.itextpdf.io.source.RASInputStream;
 import com.itextpdf.io.source.RandomAccessSourceFactory;
-import com.itextpdf.kernel.events.Event;
-import com.itextpdf.kernel.events.IEventHandler;
-import com.itextpdf.kernel.events.PdfDocumentEvent;
+import com.itextpdf.kernel.pdf.event.AbstractPdfDocumentEventHandler;
+import com.itextpdf.kernel.pdf.event.AbstractPdfDocumentEvent;
+import com.itextpdf.kernel.pdf.event.PdfDocumentEvent;
 import com.itextpdf.kernel.exceptions.KernelExceptionMessageConstant;
 import com.itextpdf.kernel.exceptions.PdfException;
 import com.itextpdf.kernel.pdf.PdfDictionary;
@@ -110,17 +110,17 @@ private ByteArrayOutputStream getDocumentByteArrayOutputStream() {
         return ((ByteArrayOutputStream) document.getWriter().getOutputStream());
     }
 
-    private final class StandaloneMacPdfObjectAdder implements IEventHandler {
+    private final class StandaloneMacPdfObjectAdder extends AbstractPdfDocumentEventHandler {
         @Override
-        public void handleEvent(Event event) {
+        public void onAcceptedEvent(AbstractPdfDocumentEvent event) {
             macPdfObject = new MacPdfObject(getContainerSizeEstimate());
             document.getTrailer().put(PdfName.AuthCode, macPdfObject.getPdfObject());
         }
     }
 
-    private final class StandaloneMacContainerEmbedder implements IEventHandler {
+    private final class StandaloneMacContainerEmbedder extends AbstractPdfDocumentEventHandler {
         @Override
-        public void handleEvent(Event event) {
+        public void onAcceptedEvent(AbstractPdfDocumentEvent event) {
             try {
                 embedMacContainerInTrailer();
             } catch (IOException e) {

kernel/src/main/java/com/itextpdf/kernel/events/IEventDispatcher.java

@@ -85,7 +85,7 @@ public static void copyOCGProperties(PdfDocument sourceDocument, PdfDocument des
      * @param page where to search for OCGs.
      * @return set of indirect references pointing to found OCGs.
      */
-    public static Set<PdfIndirectReference> getOCGsFromPage(PdfPage page) {
+    static Set<PdfIndirectReference> getOCGsFromPage(PdfPage page) {
         //Using linked hash set for elements order consistency (e.g. in tests)
         final Set<PdfIndirectReference> ocgs = new LinkedHashSet<>();
         final List<PdfAnnotation> annotations = page.getAnnotations();

kernel/src/main/java/com/itextpdf/kernel/events/IEventHandler.java

@@ -22,7 +22,7 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.kernel.pdf;
 
-import com.itextpdf.kernel.events.PdfDocumentEvent;
+import com.itextpdf.kernel.pdf.event.PdfDocumentEvent;
 import com.itextpdf.kernel.exceptions.KernelExceptionMessageConstant;
 import com.itextpdf.kernel.pdf.canvas.parser.PdfCanvasProcessor;
 import com.itextpdf.kernel.pdf.layer.PdfLayer;