Move inner classes from layout.Property to layout.property package

DEVSIX-585

Author: Snipx

forms/src/main/java/com/itextpdf/forms/fields/PdfFormField.java

@@ -79,8 +79,10 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.source.RandomAccessFileOrArray;
 import com.itextpdf.io.source.RandomAccessSourceFactory;
 import com.itextpdf.layout.Canvas;
-import com.itextpdf.layout.Property;
+import com.itextpdf.layout.property.Property;
 import com.itextpdf.layout.element.Paragraph;
+import com.itextpdf.layout.property.TextAlignment;
+import com.itextpdf.layout.property.VerticalAlignment;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -2183,15 +2185,15 @@ protected void drawTextAppearance(Rectangle rect, PdfFont font, int fontSize, St
             justification = 0;
         }
         float x = 0;
-        Property.TextAlignment textAlignment = Property.TextAlignment.LEFT;
+        TextAlignment textAlignment = TextAlignment.LEFT;
         if (justification == ALIGN_RIGHT) {
-            textAlignment = Property.TextAlignment.RIGHT;
+            textAlignment = TextAlignment.RIGHT;
             x = rect.getWidth();
         } else if (justification == ALIGN_CENTER) {
-            textAlignment = Property.TextAlignment.CENTER;
+            textAlignment = TextAlignment.CENTER;
             x = rect.getWidth() / 2;
         }
-        new Canvas(canvas, getDocument(), new Rectangle(0, -height, 0, 2 * height)).showTextAligned(paragraph, x, rect.getHeight() / 2, textAlignment, Property.VerticalAlignment.MIDDLE);
+        new Canvas(canvas, getDocument(), new Rectangle(0, -height, 0, 2 * height)).showTextAligned(paragraph, x, rect.getHeight() / 2, textAlignment, VerticalAlignment.MIDDLE);
 
         canvas.
                 restoreState().
@@ -2517,8 +2519,8 @@ protected void drawButton(PdfCanvas canvas, float x, float y, float width, float
         }
 
         Paragraph paragraph = new Paragraph(text).setFont(font).setFontSize(fontSize).setMargin(0).setMultipliedLeading(1).
-                setVerticalAlignment(Property.VerticalAlignment.MIDDLE);
-        new Canvas(canvas, getDocument(), new Rectangle(0, -height, width, 2 * height)).showTextAligned(paragraph, width / 2, height / 2, Property.TextAlignment.CENTER, Property.VerticalAlignment.MIDDLE);
+                setVerticalAlignment(VerticalAlignment.MIDDLE);
+        new Canvas(canvas, getDocument(), new Rectangle(0, -height, width, 2 * height)).showTextAligned(paragraph, width / 2, height / 2, TextAlignment.CENTER, VerticalAlignment.MIDDLE);
     }
 
     /**

layout/src/main/java/com/itextpdf/layout/ColumnDocumentRenderer.java

@@ -47,6 +47,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.layout.layout.LayoutArea;
 import com.itextpdf.layout.layout.LayoutResult;
+import com.itextpdf.layout.property.AreaBreakType;
 import com.itextpdf.layout.renderer.DocumentRenderer;
 
 /**
@@ -69,7 +70,7 @@ public ColumnDocumentRenderer(Document document, boolean immediateFlush, Rectang
 
     @Override
     protected LayoutArea updateCurrentArea(LayoutResult overflowResult) {
-        if (overflowResult != null && overflowResult.getAreaBreak() != null && overflowResult.getAreaBreak().getType() != Property.AreaBreakType.NEW_AREA) {
+        if (overflowResult != null && overflowResult.getAreaBreak() != null && overflowResult.getAreaBreak().getType() != AreaBreakType.NEW_AREA) {
             nextAreaNumber = 0;
         }
         if (nextAreaNumber % columns.length == 0) {

layout/src/main/java/com/itextpdf/layout/ElementPropertyContainer.java

@@ -50,6 +50,14 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.border.Border;
 import com.itextpdf.layout.hyphenation.HyphenationConfig;
 import com.itextpdf.layout.layout.LayoutPosition;
+import com.itextpdf.layout.property.Background;
+import com.itextpdf.layout.property.BaseDirection;
+import com.itextpdf.layout.property.FontKerning;
+import com.itextpdf.layout.property.HorizontalAlignment;
+import com.itextpdf.layout.property.Property;
+import com.itextpdf.layout.property.TextAlignment;
+import com.itextpdf.layout.property.Underline;
+import com.itextpdf.layout.property.UnitValue;
 import com.itextpdf.layout.splitting.ISplitCharacters;
 
 import java.util.Arrays;
@@ -123,9 +131,9 @@ public <T> T getDefaultProperty(Property property) {
      * Gets the width property of the Element.
      * 
      * @return the width of the element, with a value and a measurement unit.
-     * @see Property.UnitValue
+     * @see UnitValue
      */
-    public Property.UnitValue getWidth() {
+    public UnitValue getWidth() {
         return getProperty(Property.WIDTH);
     }
 
@@ -136,7 +144,7 @@ public Property.UnitValue getWidth() {
      * @return this Element.
      */
     public Type setWidth(float width) {
-        return setProperty(Property.WIDTH, Property.UnitValue.createPointValue(width));
+        return setProperty(Property.WIDTH, UnitValue.createPointValue(width));
     }
 
     /**
@@ -146,16 +154,16 @@ public Type setWidth(float width) {
      * @return this Element.
      */
     public Type setWidthPercent(float widthPercent) {
-        return setProperty(Property.WIDTH, Property.UnitValue.createPercentValue(widthPercent));
+        return setProperty(Property.WIDTH, UnitValue.createPercentValue(widthPercent));
     }
 
     /**
-     * Sets the width property of the Element with a {@link com.itextpdf.layout.Property.UnitValue}.
+     * Sets the width property of the Element with a {@link UnitValue}.
      * 
-     * @param width a {@link com.itextpdf.layout.Property.UnitValue} object
+     * @param width a {@link UnitValue} object
      * @return this Element.
      */
-    public Type setWidth(Property.UnitValue width) {
+    public Type setWidth(UnitValue width) {
         return setProperty(Property.WIDTH, width);
     }
 
@@ -214,7 +222,7 @@ public Type setRelativePosition(float left, float top, float right, float bottom
      * @return this Element.
      */
     public Type setFixedPosition(float x, float y, float width) {
-        return setFixedPosition(x, y, Property.UnitValue.createPointValue(width));
+        return setFixedPosition(x, y, UnitValue.createPointValue(width));
     }
 
     /**
@@ -224,10 +232,10 @@ public Type setFixedPosition(float x, float y, float width) {
      * 
      * @param x horizontal position on the page
      * @param y vertical position on the page
-     * @param width a {@link com.itextpdf.layout.Property.UnitValue}
+     * @param width a {@link UnitValue}
      * @return this Element.
      */
-    public Type setFixedPosition(float x, float y, Property.UnitValue width) {
+    public Type setFixedPosition(float x, float y, UnitValue width) {
         return (Type) setProperty(Property.POSITION, LayoutPosition.FIXED).
                 setProperty(Property.X, x).
                 setProperty(Property.Y, y).
@@ -261,7 +269,7 @@ public Type setFixedPosition(int pageNumber, float x, float y, float width) {
      * @param width a floating point value measured in points.
      * @return this Element.
      */
-    public Type setFixedPosition(int pageNumber, float x, float y, Property.UnitValue width) {
+    public Type setFixedPosition(int pageNumber, float x, float y, UnitValue width) {
         return (Type) setFixedPosition(x, y, width).
                 setProperty(Property.PAGE_NUMBER, pageNumber);
     }
@@ -275,10 +283,10 @@ public Type setFixedPosition(int pageNumber, float x, float y, Property.UnitValu
     /**
      * Sets the horizontal alignment of this Element.
      * 
-     * @param horizontalAlignment an enum value of type {@link com.itextpdf.layout.Property.HorizontalAlignment}
+     * @param horizontalAlignment an enum value of type {@link HorizontalAlignment}
      * @return this Element.
      */
-    public Type setHorizontalAlignment(Property.HorizontalAlignment horizontalAlignment) {
+    public Type setHorizontalAlignment(HorizontalAlignment horizontalAlignment) {
         return setProperty(Property.HORIZONTAL_ALIGNMENT, horizontalAlignment);
     }
 
@@ -315,10 +323,10 @@ public Type setFontSize(float fontSize) {
     /**
      * Sets the font size of this Element.
      * 
-     * @param alignment an enum value of type {@link com.itextpdf.layout.Property.TextAlignment}
+     * @param alignment an enum value of type {@link TextAlignment}
      * @return this Element.
      */
-    public Type setTextAlignment(Property.TextAlignment alignment) {
+    public Type setTextAlignment(TextAlignment alignment) {
         return setProperty(Property.TEXT_ALIGNMENT, alignment);
     }
 
@@ -352,7 +360,7 @@ public Type setWordSpacing(float wordSpacing) {
      * @param fontKerning an enum value as a boolean wrapper specifying whether or not to apply kerning
      * @return this Element.
      */
-    public Type setFontKerning(Property.FontKerning fontKerning) {
+    public Type setFontKerning(FontKerning fontKerning) {
         return setProperty(Property.FONT_KERNING, fontKerning);
     }
 
@@ -378,7 +386,7 @@ public Type setBackgroundColor(Color backgroundColor) {
      * @return this Element.
      */
     public Type setBackgroundColor(Color backgroundColor, float extraLeft, float extraTop, float extraRight, float extraBottom) {
-        return setProperty(Property.BACKGROUND, new Property.Background(backgroundColor, extraLeft, extraTop, extraRight, extraBottom));
+        return setProperty(Property.BACKGROUND, new Background(backgroundColor, extraLeft, extraTop, extraRight, extraBottom));
     }
 
     /**
@@ -590,12 +598,12 @@ public Type setUnderline(float thickness, float yPosition) {
      * @return this element
      */
     public Type setUnderline(Color color, float thickness, float thicknessMul, float yPosition, float yPositionMul, int lineCapStyle) {
-        Property.Underline newUnderline = new Property.Underline(color, thickness, thicknessMul, yPosition, yPositionMul, lineCapStyle);
+        Underline newUnderline = new Underline(color, thickness, thicknessMul, yPosition, yPositionMul, lineCapStyle);
         Object currentProperty = getProperty(Property.UNDERLINE);
         if (currentProperty instanceof List) {
             ((List) currentProperty).add(newUnderline);
-        } else if (currentProperty instanceof Property.Underline) {
-            setProperty(Property.UNDERLINE, Arrays.asList((Property.Underline)currentProperty, newUnderline));
+        } else if (currentProperty instanceof Underline) {
+            setProperty(Property.UNDERLINE, Arrays.asList((Underline)currentProperty, newUnderline));
         } else {
             setProperty(Property.UNDERLINE, newUnderline);
         }
@@ -609,7 +617,7 @@ public Type setUnderline(Color color, float thickness, float thicknessMul, float
      * @param baseDirection base direction
      * @return this element
      */
-    public Type setBaseDirection(Property.BaseDirection baseDirection) {
+    public Type setBaseDirection(BaseDirection baseDirection) {
         return setProperty(Property.BASE_DIRECTION, baseDirection);
     }
 

layout/src/main/java/com/itextpdf/layout/IPropertyContainer.java

@@ -44,6 +44,8 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.layout;
 
+import com.itextpdf.layout.property.Property;
+
 /**
  * A generic Map-like interface that defines methods for storing and retrieving
  * objects by an enum key of the {@link Property} type.