Propagate PdfShading class into independent classes

DEVSIX-4657

Author: nanouh

kernel/src/main/java/com/itextpdf/kernel/colors/gradients/AbstractLinearGradientBuilder.java

@@ -36,7 +36,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.colorspace.PdfDeviceCs;
 import com.itextpdf.kernel.pdf.colorspace.PdfPattern;
-import com.itextpdf.kernel.pdf.colorspace.PdfShading;
+import com.itextpdf.kernel.pdf.colorspace.shading.PdfAxialShading;
 import com.itextpdf.kernel.pdf.function.AbstractPdfFunction;
 import com.itextpdf.kernel.pdf.function.IPdfFunction;
 import com.itextpdf.kernel.pdf.function.PdfType2Function;
@@ -166,7 +166,7 @@ public Color buildColor(Rectangle targetBoundingBox, AffineTransform contextTran
             }
         }
 
-        PdfShading.Axial axial = createAxialShading(baseCoordinatesVector, this.stops, this.spreadMethod,
+        PdfAxialShading axial = createAxialShading(baseCoordinatesVector, this.stops, this.spreadMethod,
                 targetBoundingBox);
         if (axial == null) {
             return null;
@@ -273,7 +273,7 @@ protected static Point[] createCoordinatesForNewDomain(double[] newDomain, Point
         return targetCoords;
     }
 
-    private static PdfShading.Axial createAxialShading(Point[] baseCoordinatesVector,
+    private static PdfAxialShading createAxialShading(Point[] baseCoordinatesVector,
             List<GradientColorStop> stops, GradientSpreadMethod spreadMethod, Rectangle targetBoundingBox) {
         double baseVectorLength = baseCoordinatesVector[1].distance(baseCoordinatesVector[0]);
 
@@ -315,7 +315,7 @@ private static PdfShading.Axial createAxialShading(Point[] baseCoordinatesVector
             actualCoordinates = createCoordinatesForNewDomain(coordinatesDomain, baseCoordinatesVector);
         }
 
-        return new PdfShading.Axial(
+        return new PdfAxialShading(
                 new PdfDeviceCs.Rgb(),
                 createCoordsPdfArray(actualCoordinates),
                 new PdfArray(coordinatesDomain),

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

@@ -25,7 +25,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.font.PdfFont;
 import com.itextpdf.kernel.pdf.colorspace.PdfColorSpace;
 import com.itextpdf.kernel.pdf.colorspace.PdfPattern;
-import com.itextpdf.kernel.pdf.colorspace.PdfShading;
+import com.itextpdf.kernel.pdf.colorspace.shading.AbstractPdfShading;
 import com.itextpdf.kernel.pdf.extgstate.PdfExtGState;
 import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
 import com.itextpdf.kernel.pdf.xobject.PdfImageXObject;
@@ -35,7 +35,6 @@ This file is part of the iText (R) project.
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import static java.util.Collections.emptySet;
 
 /**
  * Wrapper class that represent resource dictionary - that define named resources
@@ -253,12 +252,12 @@ public PdfPattern getPattern(PdfName name) {
     }
 
     /**
-     * Adds {@link PdfShading} object to the resources.
+     * Adds {@link AbstractPdfShading} object to the resources.
      *
-     * @param shading the {@link PdfShading} to add.
+     * @param shading the {@link AbstractPdfShading} to add.
      * @return added shading resource name.
      */
-    public PdfName addShading(PdfShading shading) {
+    public PdfName addShading(AbstractPdfShading shading) {
         return addResource(shading, shadingNamesGen);
     }
 
@@ -272,9 +271,9 @@ public PdfName addShading(PdfDictionary shading) {
         return addResource(shading, shadingNamesGen);
     }
 
-    public PdfShading getShading(PdfName name) {
+    public AbstractPdfShading getShading(PdfName name) {
         PdfObject shading = getResourceObject(PdfName.Shading, name);
-        return shading instanceof PdfDictionary ? PdfShading.makeShading((PdfDictionary) shading) : null;
+        return shading instanceof PdfDictionary ? AbstractPdfShading.makeShading((PdfDictionary) shading) : null;
     }
 
     protected boolean isReadOnly() {

kernel/src/main/java/com/itextpdf/kernel/pdf/canvas/PdfCanvas.java

@@ -60,7 +60,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.colorspace.PdfColorSpace;
 import com.itextpdf.kernel.pdf.colorspace.PdfDeviceCs;
 import com.itextpdf.kernel.pdf.colorspace.PdfPattern;
-import com.itextpdf.kernel.pdf.colorspace.PdfShading;
+import com.itextpdf.kernel.pdf.colorspace.shading.AbstractPdfShading;
 import com.itextpdf.kernel.pdf.colorspace.PdfSpecialCs;
 import com.itextpdf.kernel.pdf.extgstate.PdfExtGState;
 import com.itextpdf.kernel.pdf.layer.IPdfOCG;
@@ -1280,7 +1280,7 @@ public PdfCanvas circle(double x, double y, double r) {
      * @param shading a shading object to be painted
      * @return current canvas.
      */
-    public PdfCanvas paintShading(PdfShading shading) {
+    public PdfCanvas paintShading(AbstractPdfShading shading) {
         PdfName shadingName = resources.addShading(shading);
         contentStream.getOutputStream().write((PdfObject) shadingName).writeSpace().writeBytes(sh);
         return this;

kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfPattern.java

@@ -31,6 +31,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfObjectWrapper;
 import com.itextpdf.kernel.pdf.PdfResources;
 import com.itextpdf.kernel.pdf.PdfStream;
+import com.itextpdf.kernel.pdf.colorspace.shading.AbstractPdfShading;
 
 /**
  * Dictionary wrapper that represent special type of color space, that uses pattern objects
@@ -427,39 +428,39 @@ public Shading(PdfDictionary pdfObject) {
         /**
          * Creates a new instance of Shading Pattern.
          *
-         * @param shading the {@link PdfShading} that specifies the details of a particular
+         * @param shading the {@link AbstractPdfShading} that specifies the details of a particular
          *                gradient fill
          */
-        public Shading(com.itextpdf.kernel.pdf.colorspace.PdfShading shading) {
+        public Shading(AbstractPdfShading shading) {
             super(new PdfDictionary());
             getPdfObject().put(PdfName.Type, PdfName.Pattern);
             getPdfObject().put(PdfName.PatternType, new PdfNumber(2));
             getPdfObject().put(PdfName.Shading, shading.getPdfObject());
         }
 
         /**
-         * Gets the dictionary of the pattern's {@link PdfShading}.
+         * Gets the dictionary of the pattern's {@link AbstractPdfShading}.
          *
-         * @return the dictionary of the pattern's {@link PdfShading}
+         * @return the dictionary of the pattern's {@link AbstractPdfShading}
          */
         public PdfDictionary getShading() {
             return (PdfDictionary) getPdfObject().get(PdfName.Shading);
         }
 
         /**
-         * Sets the {@link PdfShading} that specifies the details of a particular gradient fill.
+         * Sets the {@link AbstractPdfShading} that specifies the details of a particular gradient fill.
          *
-         * @param shading the {@link PdfShading} that specifies the details of a particular gradient fill
+         * @param shading the {@link AbstractPdfShading} that specifies the details of a particular gradient fill
          */
-        public void setShading(com.itextpdf.kernel.pdf.colorspace.PdfShading shading) {
+        public void setShading(AbstractPdfShading shading) {
             getPdfObject().put(PdfName.Shading, shading.getPdfObject());
             setModified();
         }
 
         /**
          * Sets the dictionary which specifies the details of a particular gradient fill.
          *
-         * @param shading the dictionary of the pattern's {@link PdfShading}
+         * @param shading the dictionary of the pattern's {@link AbstractPdfShading}
          */
         public void setShading(PdfDictionary shading) {
             getPdfObject().put(PdfName.Shading, shading);