Review remnant deprecated fields, methods and classes

Author: yulian-gaponenko

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

@@ -48,28 +48,8 @@ This file is part of the iText (R) project.
  */
 public enum IsoKey {
     CANVAS_STACK,
-    /**
-     * @deprecated Will be removed in 7.1.0.
-     */
-    @Deprecated
-    DRAWMODE_FILL,
-    /**
-     * @deprecated Will be removed in 7.1.0.
-     */
-    @Deprecated
-    DRAWMODE_FILL_STROKE,
-    /**
-     * @deprecated Will be removed in 7.1.0.
-     */
-    @Deprecated
-    DRAWMODE_STROKE,
     FILL_COLOR,
     EXTENDED_GRAPHICS_STATE,
-    /**
-     * @deprecated Will be removed in 7.1.0.
-     */
-    @Deprecated
-    GRAPHIC_STATE_ONLY,
     INLINE_IMAGE,
     PAGE,
     PDF_OBJECT,

kernel/src/main/java/com/itextpdf/kernel/pdf/annot/PdfPolyGeomAnnotation.java

@@ -65,12 +65,7 @@ public class PdfPolyGeomAnnotation extends PdfMarkupAnnotation {
     public static final PdfName Polygon = PdfName.Polygon;
     public static final PdfName PolyLine = PdfName.PolyLine;
 
-    /**
-     * @deprecated  Use {@link #createPolygon(Rectangle, float[])} or {@link #createPolyLine(Rectangle, float[])} instead.
-     *              Will be made private in 7.1.
-     */
-    @Deprecated
-    public PdfPolyGeomAnnotation(Rectangle rect, PdfName subtype, float[] vertices) {
+    private PdfPolyGeomAnnotation(Rectangle rect, PdfName subtype, float[] vertices) {
         super(rect);
         setSubtype(subtype);
         setVertices(vertices);

pdfa/src/main/java/com/itextpdf/pdfa/PdfADocument.java

@@ -154,45 +154,6 @@ public void checkIsoConformance(Object obj, IsoKey key) {
         checkIsoConformance(obj, key, null);
     }
 
-    /**
-     * @deprecated Will be removed in 7.1.0.
-     */
-    @Override
-    @Deprecated
-    public void checkShowTextIsoConformance(CanvasGraphicsState gState, PdfResources resources) {
-        boolean fill = false;
-        boolean stroke = false;
-
-        switch (gState.getTextRenderingMode()) {
-            case PdfCanvasConstants.TextRenderingMode.STROKE:
-            case PdfCanvasConstants.TextRenderingMode.STROKE_CLIP:
-                stroke = true;
-                break;
-            case PdfCanvasConstants.TextRenderingMode.FILL:
-            case PdfCanvasConstants.TextRenderingMode.FILL_CLIP:
-                fill = true;
-                break;
-            case PdfCanvasConstants.TextRenderingMode.FILL_STROKE:
-            case PdfCanvasConstants.TextRenderingMode.FILL_STROKE_CLIP:
-                stroke = true;
-                fill = true;
-                break;
-        }
-
-        IsoKey drawMode = IsoKey.DRAWMODE_FILL;
-        if (fill && stroke) {
-            drawMode = IsoKey.DRAWMODE_FILL_STROKE;
-        } else if (fill) {
-            drawMode = IsoKey.DRAWMODE_FILL;
-        } else if (stroke) {
-            drawMode = IsoKey.DRAWMODE_STROKE;
-        }
-
-        if (fill || stroke) {
-            checkIsoConformance(gState, drawMode, resources);
-        }
-    }
-
     @Override
     public void checkIsoConformance(Object obj, IsoKey key, PdfResources resources) {
         CanvasGraphicsState gState;
@@ -217,37 +178,17 @@ public void checkIsoConformance(Object obj, IsoKey key, PdfResources resources)
                 gState = (CanvasGraphicsState) obj;
                 checker.checkExtGState(gState);
                 break;
-            case GRAPHIC_STATE_ONLY:
-                gState = (CanvasGraphicsState) obj;
-                checker.checkExtGState(gState);
-                break;
-            case DRAWMODE_FILL:
-                gState = (CanvasGraphicsState) obj;
-                checker.checkColor(gState.getFillColor(), currentColorSpaces, true);
-                checker.checkExtGState(gState);
-                break;
             case FILL_COLOR:
                 gState = (CanvasGraphicsState) obj;
                 checker.checkColor(gState.getFillColor(), currentColorSpaces, true);
                 break;
             case PAGE:
                 checker.checkSinglePage((PdfPage) obj);
                 break;
-            case DRAWMODE_STROKE:
-                gState = (CanvasGraphicsState) obj;
-                checker.checkColor(gState.getStrokeColor(), currentColorSpaces, false);
-                checker.checkExtGState(gState);
-                break;
             case STROKE_COLOR:
                 gState = (CanvasGraphicsState) obj;
                 checker.checkColor(gState.getStrokeColor(), currentColorSpaces, false);
                 break;
-            case DRAWMODE_FILL_STROKE:
-                gState = (CanvasGraphicsState) obj;
-                checker.checkColor(gState.getFillColor(), currentColorSpaces, true);
-                checker.checkColor(gState.getStrokeColor(), currentColorSpaces, false);
-                checker.checkExtGState(gState);
-                break;
             case TAG_STRUCTURE_ELEMENT:
                 checker.checkTagStructureElement((PdfObject) obj);
                 break;