Rename model -> layout.

Author: pavel-alay

forms/pom.xml

@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
-            <artifactId>model</artifactId>
+            <artifactId>layout</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

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

@@ -34,9 +34,9 @@
 import com.itextpdf.io.source.PdfTokenizer;
 import com.itextpdf.io.source.RandomAccessFileOrArray;
 import com.itextpdf.io.source.RandomAccessSourceFactory;
-import com.itextpdf.model.Canvas;
-import com.itextpdf.model.Property;
-import com.itextpdf.model.element.Paragraph;
+import com.itextpdf.layout.Canvas;
+import com.itextpdf.layout.Property;
+import com.itextpdf.layout.element.Paragraph;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -2189,7 +2189,7 @@ private String obfuscatePassword(String text) {
     }
 
     private void setParagraphProperties(Paragraph paragraph, String value) {
-        // TODO this is temporary and will be replaced by script autodetection logic on model level
+        // TODO this is temporary and will be replaced by script autodetection logic on layout level
         if (value != null && value.length() > 0) {
             Character.UnicodeScript script = Character.UnicodeScript.of(value.charAt(0));
             paragraph.setFontScript(script);

kernel/src/main/java/com/itextpdf/kernel/pdf/canvas/draw/Drawable.java

@@ -7,7 +7,7 @@
  * The <code>Drawable</code> defines a drawing operation on a {@link PdfCanvas}
  *
  * This interface allows to customize the 'empty' space in a
- * {@link com.itextpdf.model.element.Tabstop TabStop} through a Strategy design
+ * {@link com.itextpdf.layout.element.Tabstop TabStop} through a Strategy design
  * pattern
  */
 public interface Drawable {

model/pom.xml renamed to layout/pom.xml

@@ -10,8 +10,8 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>model</artifactId>
-    <name>iText 6 (Arya) - model</name>
+    <artifactId>layout</artifactId>
+    <name>iText 6 (Arya) - layout</name>
     <url>http://itextpdf.com/</url>
 
     <dependencies>

model/src/main/java/com/itextpdf/model/Canvas.java renamed to layout/src/main/java/com/itextpdf/layout/Canvas.java

@@ -1,18 +1,18 @@
-package com.itextpdf.model;
+package com.itextpdf.layout;
 
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
-import com.itextpdf.model.renderer.CanvasRenderer;
-import com.itextpdf.model.renderer.RootRenderer;
+import com.itextpdf.layout.renderer.CanvasRenderer;
+import com.itextpdf.layout.renderer.RootRenderer;
 
 /**
  * This class is used for adding content directly onto a specified {@link PdfCanvas}.
  * {@link Canvas} does not know the concept of a page, so it can't reflow to a 'next' {@link Canvas}.
  * 
- * This class effectively acts as a bridge between the high-level <em>model</em>
+ * This class effectively acts as a bridge between the high-level <em>layout</em>
  * API and the low-level <em>kernel</em> API.
  */
 public class Canvas extends RootElement<Canvas> {

model/src/main/java/com/itextpdf/model/Document.java renamed to layout/src/main/java/com/itextpdf/layout/Document.java

@@ -1,15 +1,15 @@
-package com.itextpdf.model;
+package com.itextpdf.layout;
 
 import com.itextpdf.kernel.PdfException;
 import com.itextpdf.kernel.geom.PageSize;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
-import com.itextpdf.model.element.AreaBreak;
-import com.itextpdf.model.element.BlockElement;
-import com.itextpdf.model.element.IElement;
-import com.itextpdf.model.element.ILargeElement;
-import com.itextpdf.model.renderer.DocumentRenderer;
-import com.itextpdf.model.renderer.RootRenderer;
+import com.itextpdf.layout.element.AreaBreak;
+import com.itextpdf.layout.element.BlockElement;
+import com.itextpdf.layout.element.IElement;
+import com.itextpdf.layout.element.ILargeElement;
+import com.itextpdf.layout.renderer.DocumentRenderer;
+import com.itextpdf.layout.renderer.RootRenderer;
 
 public class Document extends RootElement<Document> {
 

model/src/main/java/com/itextpdf/model/ElementPropertyContainer.java renamed to layout/src/main/java/com/itextpdf/layout/ElementPropertyContainer.java

@@ -1,21 +1,21 @@
-package com.itextpdf.model;
+package com.itextpdf.layout;
 
 import com.itextpdf.kernel.pdf.canvas.PdfCanvasConstants;
 import com.itextpdf.kernel.color.Color;
 import com.itextpdf.kernel.font.PdfFont;
-import com.itextpdf.model.border.Border;
-import com.itextpdf.model.hyphenation.HyphenationConfig;
-import com.itextpdf.model.layout.LayoutPosition;
-import com.itextpdf.model.splitting.ISplitCharacters;
+import com.itextpdf.layout.border.Border;
+import com.itextpdf.layout.hyphenation.HyphenationConfig;
+import com.itextpdf.layout.layout.LayoutPosition;
+import com.itextpdf.layout.splitting.ISplitCharacters;
 
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
 /**
- * A generic abstract element that fits in a PDF model object hierarchy. 
- * A superclass of all {@link IElement model object} implementations.
+ * A generic abstract element that fits in a PDF layout object hierarchy.
+ * A superclass of all {@link IElement layout object} implementations.
  * 
  * @param <Type> this type
  */
@@ -106,9 +106,9 @@ public Type setWidthPercent(float widthPercent) {
     }
 
     /**
-     * Sets the width property of the Element with a {@link com.itextpdf.model.Property.UnitValue}.
+     * Sets the width property of the Element with a {@link com.itextpdf.layout.Property.UnitValue}.
      * 
-     * @param width a {@link com.itextpdf.model.Property.UnitValue} object
+     * @param width a {@link com.itextpdf.layout.Property.UnitValue} object
      * @return this Element.
      */
     public Type setWidth(Property.UnitValue width) {
@@ -180,7 +180,7 @@ 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.model.Property.UnitValue}
+     * @param width a {@link com.itextpdf.layout.Property.UnitValue}
      * @return this Element.
      */
     public Type setFixedPosition(float x, float y, Property.UnitValue width) {
@@ -231,7 +231,7 @@ 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.model.Property.HorizontalAlignment}
+     * @param horizontalAlignment an enum value of type {@link com.itextpdf.layout.Property.HorizontalAlignment}
      * @return this Element.
      */
     public Type setHorizontalAlignment(Property.HorizontalAlignment horizontalAlignment) {
@@ -271,7 +271,7 @@ public Type setFontSize(float fontSize) {
     /**
      * Sets the font size of this Element.
      * 
-     * @param alignment an enum value of type {@link com.itextpdf.model.Property.TextAlignment}
+     * @param alignment an enum value of type {@link com.itextpdf.layout.Property.TextAlignment}
      * @return this Element.
      */
     public Type setTextAlignment(Property.TextAlignment alignment) {
@@ -384,7 +384,7 @@ public Type setBorderLeft(Border border) {
 
     /**
      * Sets a rule for splitting strings when they don't fit into one line.
-     * The default implementation is {@link com.itextpdf.model.splitting.DefaultSplitCharacters}
+     * The default implementation is {@link com.itextpdf.layout.splitting.DefaultSplitCharacters}
      * @param splitCharacters an implementation of {@link ISplitCharacters}
      * @return this Element.
      */

model/src/main/java/com/itextpdf/model/IPropertyContainer.java renamed to layout/src/main/java/com/itextpdf/layout/IPropertyContainer.java

@@ -1,4 +1,4 @@
-package com.itextpdf.model;
+package com.itextpdf.layout;
 
 /**
  * An generic Map-like interface that defines methods for storing and retrieving

model/src/main/java/com/itextpdf/model/Property.java renamed to layout/src/main/java/com/itextpdf/layout/Property.java

@@ -1,9 +1,9 @@
-package com.itextpdf.model;
+package com.itextpdf.layout;
 
 import com.itextpdf.kernel.color.Color;
 
 /**
- * An enum of property names that are used for graphical properties of model
+ * An enum of property names that are used for graphical properties of layout
  * elements. The {@link IPropertyContainer} performs the same function as an
  * {@link EnumMap}, with the values of {@link Property} as its potential keys.
  */
@@ -394,7 +394,7 @@ public int hashCode() {
 
     /**
      * A specialized enum holding the possible values for a list {@link
-     * com.itextpdf.model.element.List}'s entry prefix. This class is meant to
+     * com.itextpdf.layout.element.List}'s entry prefix. This class is meant to
      * be used as the value for the {@link Property#LIST_SYMBOL} key in an
      * {@link IPropertyContainer}.
      */
@@ -418,7 +418,7 @@ public enum ListNumberingType {
 
     /**
      * A specialized enum holding the possible values for a {@link
-     * com.itextpdf.model.element.List List}'s entry prefix. This class is meant
+     * com.itextpdf.layout.element.List List}'s entry prefix. This class is meant
      * to be used as the value for the {@link Property#LIST_SYMBOL} key in an
      * {@link IPropertyContainer}.
      */

model/src/main/java/com/itextpdf/model/RootElement.java renamed to layout/src/main/java/com/itextpdf/layout/RootElement.java

@@ -1,19 +1,19 @@
-package com.itextpdf.model;
+package com.itextpdf.layout;
 
 import com.itextpdf.kernel.font.PdfFont;
 import com.itextpdf.kernel.font.PdfFontFactory;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfName;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvasConstants;
-import com.itextpdf.model.element.BlockElement;
-import com.itextpdf.model.element.Div;
-import com.itextpdf.model.element.IElement;
-import com.itextpdf.model.element.Image;
-import com.itextpdf.model.element.Paragraph;
-import com.itextpdf.model.renderer.AbstractRenderer;
-import com.itextpdf.model.renderer.RootRenderer;
-import com.itextpdf.model.splitting.DefaultSplitCharacters;
-import com.itextpdf.model.splitting.ISplitCharacters;
+import com.itextpdf.layout.element.BlockElement;
+import com.itextpdf.layout.element.Div;
+import com.itextpdf.layout.element.IElement;
+import com.itextpdf.layout.element.Image;
+import com.itextpdf.layout.element.Paragraph;
+import com.itextpdf.layout.renderer.AbstractRenderer;
+import com.itextpdf.layout.renderer.RootRenderer;
+import com.itextpdf.layout.splitting.DefaultSplitCharacters;
+import com.itextpdf.layout.splitting.ISplitCharacters;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 /**
- * A generic abstract root element for a PDF model object hierarchy.
+ * A generic abstract root element for a PDF layout object hierarchy.
  * 
  * @param <Type> this type
  */