move the "common" property classes from layout to fo.properties, renaming them with a "Common" prefix

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196790 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 18 insertions, 18 deletions

diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java
index 682595a47..766877183 100644
--- a/src/java/org/apache/fop/fo/pagination/Region.java
+++ b/src/java/org/apache/fop/fo/pagination/Region.java
@@ -58,8 +58,8 @@ import java.awt.geom.Rectangle2D;
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FONode;
-import org.apache.fop.layout.BorderAndPadding;
-import org.apache.fop.layout.BackgroundProps;
+import org.apache.fop.fo.properties.CommonBorderAndPadding;
+import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.area.CTM;
 import org.apache.fop.area.RegionViewport;
@@ -159,8 +159,8 @@ public abstract class Region extends FObj {
      */
     protected void setRegionViewportTraits(RegionViewport r) {
         // Common Border, Padding, and Background Properties
-        BorderAndPadding bap = propMgr.getBorderAndPadding();
-        BackgroundProps bProps = propMgr.getBackgroundProps();
+        CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
+        CommonBackground bProps = propMgr.getBackgroundProps();
         TraitSetter.addBorders(r, bap);
         TraitSetter.addBackground(r, bProps);
 
diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java
index e7b278c30..f3c65ceb6 100644
--- a/src/java/org/apache/fop/fo/pagination/RegionBody.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java
@@ -65,7 +65,7 @@ import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.FODimension;
 import org.apache.fop.area.RegionReference;
 import org.apache.fop.area.BodyRegion;
-import org.apache.fop.layout.MarginProps;
+import org.apache.fop.fo.properties.CommonMarginBlock;
 
 /**
  * The fo:region-body element.
@@ -92,7 +92,7 @@ public class RegionBody extends Region {
         * writing-mode on the page (not on the region-body!). If that's not
         * set but indent is explicitly set, it will return that.
         */
-        MarginProps mProps = propMgr.getMarginProps();
+        CommonMarginBlock mProps = propMgr.getMarginProps();
         int start = getRelMargin(PropertyList.START, "start-indent");
         Rectangle vpRect;
         if (this.wm == WritingMode.LR_TB || this.wm == WritingMode.RL_TB) {
diff --git a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
index 3353fe1f8..6b3c52097 100644
--- a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
+++ b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
@@ -68,7 +68,7 @@ import org.apache.fop.area.PageViewport;
 import org.apache.fop.area.Page;
 import org.apache.fop.area.RegionViewport;
 import org.apache.fop.area.RegionReference;
-import org.apache.fop.layout.MarginProps;
+import org.apache.fop.fo.properties.CommonMarginBlock;
 import org.apache.fop.layout.PageMaster;
 import org.apache.fop.apps.FOPException;
 
@@ -130,7 +130,7 @@ public class SimplePageMaster extends FObj {
         // this.properties.get("writing-mode");
 
         // Get absolute margin properties (top, left, bottom, right)
-        MarginProps mProps = propMgr.getMarginProps();
+        CommonMarginBlock mProps = propMgr.getMarginProps();
 
         /* Create the page reference area rectangle (0,0 is at top left
         * of the "page media" and y increases
diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java
index 85c39b993..a1b9c9d98 100644
--- a/src/java/org/apache/fop/fo/pagination/Title.java
+++ b/src/java/org/apache/fop/fo/pagination/Title.java
@@ -58,12 +58,12 @@ import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.LengthProperty;
 import org.apache.fop.fo.Property;
-import org.apache.fop.layout.AccessibilityProps;
-import org.apache.fop.layout.AuralProps;
-import org.apache.fop.layout.BackgroundProps;
-import org.apache.fop.layout.BorderAndPadding;
+import org.apache.fop.fo.properties.CommonAccessibility;
+import org.apache.fop.fo.properties.CommonAural;
+import org.apache.fop.fo.properties.CommonBackground;
+import org.apache.fop.fo.properties.CommonBorderAndPadding;
 import org.apache.fop.layout.FontState;
-import org.apache.fop.layout.MarginInlineProps;
+import org.apache.fop.fo.properties.CommonMarginInline;
 import org.apache.fop.layoutmgr.ContentLayoutManager;
 import org.apache.fop.layoutmgr.InlineStackingLayoutManager;
 import org.apache.fop.layoutmgr.LMiter;
@@ -110,20 +110,20 @@ public class Title extends FObjMixed {
     private void setup() {
 
         // Common Accessibility Properties
-        AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+        CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
 
         // Common Aural Properties
-        AuralProps mAurProps = propMgr.getAuralProps();
+        CommonAural mAurProps = propMgr.getAuralProps();
 
         // Common Border, Padding, and Background Properties
-        BorderAndPadding bap = propMgr.getBorderAndPadding();
-        BackgroundProps bProps = propMgr.getBackgroundProps();
+        CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
+        CommonBackground bProps = propMgr.getBackgroundProps();
 
         // Common Font Properties
         FontState fontState = propMgr.getFontState(foInputHandler.getFontInfo());
 
         // Common Margin Properties-Inline
-        MarginInlineProps mProps = propMgr.getMarginInlineProps();
+        CommonMarginInline mProps = propMgr.getMarginInlineProps();
 
         Property prop;
         prop = this.properties.get("baseline-shift");