GH-314 clean up.

pcorless · Feb 3, 2024 · 4ec6874 · 4ec6874
1 parent 357b96b
commit 4ec6874
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 23 deletions.
diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/annotations/RedactionAnnotation.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/annotations/RedactionAnnotation.java
@@ -156,9 +156,6 @@ public void resetAppearanceStream(double dx, double dy, AffineTransform pageSpac
             return;
         }
 
-        // todo: Revisit as there is a lot of duplicate code here also found in textMarkupAnnotations, however
-        // this may change when image redaction code is added.
-
         Appearance appearance = appearances.get(currentAppearance);
         AppearanceState appearanceState = appearance.getSelectedAppearanceState();
         appearanceState.setShapes(new Shapes());

diff --git a/core/core-awt/src/main/java/org/icepdf/core/util/Utils.java b/core/core-awt/src/main/java/org/icepdf/core/util/Utils.java
@@ -347,7 +347,7 @@ public static String convertByteArrayToByteString(byte[] bytes) {
 
     /**
      * Utility method for decrypting a String object found in a dictionary
-     * as a plaing text.  The string can be encrypted as well as octal encoded,
+     * as a plain text.  The string can be encrypted as well as octal encoded,
      * which is handle by this method.
      *
      * @param library      document library used for encryption handling.
@@ -397,7 +397,7 @@ public static String convertStringObject(Library library, StringObject stringObj
     }
 
     /**
-     * Convert a utf-8 encoded string into an octal encded byte[] array.
+     * Convert an utf-8 encoded string into an octal encoded byte[] array.
      *
      * @param literalString string to convert.
      * @return converted string value.

diff --git a/core/core-awt/src/main/java/org/icepdf/core/util/redaction/Redactor.java b/core/core-awt/src/main/java/org/icepdf/core/util/redaction/Redactor.java
@@ -4,6 +4,7 @@
 import org.icepdf.core.pobjects.PObject;
 import org.icepdf.core.pobjects.Page;
 import org.icepdf.core.pobjects.StateManager;
+import org.icepdf.core.pobjects.annotations.Annotation;
 import org.icepdf.core.pobjects.annotations.RedactionAnnotation;
 
 import java.io.IOException;
@@ -40,11 +41,11 @@ public static void burnRedactions(Document document) throws InterruptedException
     private static void convertRedactionToSquareAnnotation(StateManager stateManager,
                                                            List<RedactionAnnotation> redactionAnnotations) {
         for (RedactionAnnotation redactionAnnotation : redactionAnnotations) {
-//            redactionAnnotation.setSubtype(Annotation.SUBTYPE_SQUARE);
-//            redactionAnnotation.setFlag(Annotation.FLAG_LOCKED, true);
-//            redactionAnnotation.setFlag(Annotation.FLAG_READ_ONLY, true);
-//            redactionAnnotation.setFlag(Annotation.FLAG_LOCKED_CONTENTS, true);
-//            stateManager.addChange(new PObject(redactionAnnotation, redactionAnnotation.getPObjectReference()));
+            redactionAnnotation.setSubtype(Annotation.SUBTYPE_SQUARE);
+            redactionAnnotation.setFlag(Annotation.FLAG_LOCKED, true);
+            redactionAnnotation.setFlag(Annotation.FLAG_READ_ONLY, true);
+            redactionAnnotation.setFlag(Annotation.FLAG_LOCKED_CONTENTS, true);
+            stateManager.addChange(new PObject(redactionAnnotation, redactionAnnotation.getPObjectReference()));
             stateManager.addDeletion(new PObject(redactionAnnotation, redactionAnnotation.getPObjectReference()));
         }
     }

diff --git a/core/core-awt/src/main/java/org/icepdf/core/util/updater/writeables/image/RasterEncoder.java b/core/core-awt/src/main/java/org/icepdf/core/util/updater/writeables/image/RasterEncoder.java
@@ -35,11 +35,6 @@ public ImageStream encode() throws IOException {
         if (isGrayScaleImage(imageStream)) {
             byteArray = createFromGrayScaleImage(imageStream);
         } else {
-            // may need to look at the mask value, if arrray we have ColorKeyMask and are rgba?
-//            BufferedImage image = imageStream.getDecodedImage();
-//            ImageUtility.displayImage(imageStream.getDecodedImage(),
-//                    imageStream.getPObjectReference().toString() + image.getWidth() +
-//                            " " + "x" + image.getHeight());
             byteArray = createFromRGBImage(imageStream);
         }
         byte[] outputData = createFlateEncodedBytes(byteArray);

diff --git a/...tools/TextRedactionAnnotationHandler.java → ...mon/tools/RedactionAnnotationHandler.java b/...tools/TextRedactionAnnotationHandler.java → ...mon/tools/RedactionAnnotationHandler.java
@@ -32,12 +32,12 @@
  *
  * @since 7.2
  */
-public class TextRedactionAnnotationHandler extends HighLightAnnotationHandler {
+public class RedactionAnnotationHandler extends HighLightAnnotationHandler {
 
     private boolean isOverImage = false;
 
-    public TextRedactionAnnotationHandler(DocumentViewController documentViewController,
-                                          AbstractPageViewComponent pageViewComponent) {
+    public RedactionAnnotationHandler(DocumentViewController documentViewController,
+                                      AbstractPageViewComponent pageViewComponent) {
         super(documentViewController, pageViewComponent);
         markupSubType = Annotation.SUBTYPE_REDACT;
         selectionBoxColour = Color.BLACK;
@@ -175,8 +175,6 @@ public void createMarkupAnnotationFromSelectionBox() {
 
             convertToPageSpace(redactionBounds, highlightPath);
 
-            // todo cleanup duplication
-
             AffineTransform pageTransform = getToPageSpaceTransform();
             annotation.setColor(Color.BLACK);
             annotation.setMarkupBounds(redactionBounds);

diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/PageViewComponentImpl.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/PageViewComponentImpl.java
@@ -153,9 +153,9 @@ public void setToolMode(final int viewToolMode) {
                 break;
             case DocumentViewModel.DISPLAY_TOOL_REDACTION_ANNOTATION:
                 // handler is responsible for the initial creation of the annotation
-                currentToolHandler = new TextRedactionAnnotationHandler(
+                currentToolHandler = new RedactionAnnotationHandler(
                         documentViewController, this);
-                ((TextRedactionAnnotationHandler) currentToolHandler).createMarkupAnnotation(null);
+                ((RedactionAnnotationHandler) currentToolHandler).createMarkupAnnotation(null);
                 documentViewController.clearSelectedText();
                 break;
 
@@ -237,8 +237,9 @@ public ArrayList<AbstractAnnotationComponent> getAnnotationComponents() {
     public AnnotationComponent getComponentFor(Annotation annot) {
         if (annotationToComponent == null) {
             initializeAnnotationsComponent(getPage());
+            return annotationToComponent.get(annot.getPObjectReference());
         }
-        return annotationToComponent.get(annot.getPObjectReference());
+        return null;
     }
 
     /**