Third phase of performance improvement.

- Added javadoc comment.
- Fixed the type of properties.

PR: 31699


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

4 files changed, 171 insertions, 12 deletions

diff --git a/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java b/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java
index 659c98b66..4babaf2f6 100644
--- a/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java
+++ b/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java
@@ -18,19 +18,53 @@
 
 package org.apache.fop.fo.properties;
 
+import org.apache.fop.datatypes.Length;
+import org.apache.fop.fo.Constants;
+import org.apache.fop.fo.PropertyList;
+
 /**
  * Store all common absolute position properties.
  * See Sec. 7.5 of the XSL-FO Standard.
  * Public "structure" allows direct member access.
  */
 public class CommonAbsolutePosition {
+    /**
+     * The "absolute-position" property.
+     */
     public int absolutePosition;
-    public int top;
-    public int right;
-    public int bottom;
-    public int left;
+
+    /**
+     * The "top" property.
+     */
+    public Length top;
+
+    /**
+     * The "right" property.
+     */
+    public Length right;
+    
+    /**
+     * The "bottom" property.
+     */
+    public Length bottom;
+    
+    /**
+     * The "left" property.
+     */
+    public Length left;
 
     public CommonAbsolutePosition() {
     }
 
+    /**
+     * Create a CommonAbsolutePosition object.
+     * @param pList The PropertyList with propery values.
+     */
+    public CommonAbsolutePosition(PropertyList pList) {
+        absolutePosition = pList.get(Constants.PR_ABSOLUTE_POSITION).getEnum();
+        top = pList.get(Constants.PR_TOP).getLength();
+        bottom = pList.get(Constants.PR_BOTTOM).getLength();
+        left = pList.get(Constants.PR_LEFT).getLength();
+        right = pList.get(Constants.PR_RIGHT).getLength();      
+    }
 }
diff --git a/src/java/org/apache/fop/fo/properties/CommonAural.java b/src/java/org/apache/fop/fo/properties/CommonAural.java
index 34f3dda51..68a538b87 100644
--- a/src/java/org/apache/fop/fo/properties/CommonAural.java
+++ b/src/java/org/apache/fop/fo/properties/CommonAural.java
@@ -18,30 +18,111 @@
 
 package org.apache.fop.fo.properties;
 
+import org.apache.fop.fo.PropertyList;
+
 /**
  * Stores all common aural properties.
  * See Sec. 7.6 of the XSL-FO Standard.
  * Public "structure" allows direct member access.
  */
 public class CommonAural {
-
+    /**
+     * The "azimuth" property.
+     */
     public int azimuth;
+
+    /**
+     * The "cueAfter" property.
+     */
     public String cueAfter;
+
+    /**
+     * The "cueBefore" property.
+     */
     public String cueBefore;
+
+    /**
+     * The "elevation" property.
+     */
     public int elevation;
+
+    /**
+     * The "pauseAfter" property.
+     */
     public int pauseAfter;
+
+    /**
+     * The "pauseBefore" property.
+     */
     public int pauseBefore;
+
+    /**
+     * The "pitch" property.
+     */
     public int pitch;
+
+    /**
+     * The "pitch-range" property.
+     */
     public int pitchRange;
+
+    /**
+     * The "playDuring" property.
+     */
     public int playDuring;
+
+    /**
+     * The "richness" property.
+     */
     public int richness;
+
+    /**
+     * The "speak" property.
+     */
     public int speak;
+
+    /**
+     * The "speak-header" property.
+     */
     public int speakHeader;
+
+    /**
+     * The "speak-numeral" property.
+     */
     public int speakNumeral;
+
+    /**
+     * The "speak-punctuation" property.
+     */
     public int speakPunctuation;
+
+    /**
+     * The "speech-rate" property.
+     */
     public int speechRate;
+
+    /**
+     * The "stress" property.
+     */
     public int stress;
+
+    /**
+     * The "voice-family" property.
+     */
     public int voiceFamily;
+
+    /**
+     * The "volume" property.
+     */
     public int volume;
 
+    public CommonAural() {
+    }
+
+    /**
+     * Create a CommonAbsolutePosition object.
+     * @param pList The PropertyList with propery values.
+     */
+    public CommonAural(PropertyList pList) {
+    }
 }
diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
index 75c1b973b..1fee10090 100755
--- a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
+++ b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
@@ -79,7 +79,7 @@ public class CommonBorderPaddingBackground implements Cloneable {
     private CondLengthProperty[] padding = new CondLengthProperty[4];
 
     /**
-     * Construct a CommonBorderAndPadding object.
+     * Construct a CommonBorderPaddingBackground object.
      * @param pList The PropertyList to get properties from.
      */
     public CommonBorderPaddingBackground(PropertyList pList) {
diff --git a/src/java/org/apache/fop/fo/properties/CommonMarginInline.java b/src/java/org/apache/fop/fo/properties/CommonMarginInline.java
index 16a4ca3a2..fd23b3d96 100644
--- a/src/java/org/apache/fop/fo/properties/CommonMarginInline.java
+++ b/src/java/org/apache/fop/fo/properties/CommonMarginInline.java
@@ -18,6 +18,10 @@
 
 package org.apache.fop.fo.properties;
 
+import org.apache.fop.datatypes.Length;
+import org.apache.fop.fo.Constants;
+import org.apache.fop.fo.PropertyList;
+
 /**
  * Store all common margin properties for inlines.
  * See Sec. 7.11 of the XSL-FO Standard.
@@ -25,11 +29,51 @@ package org.apache.fop.fo.properties;
  */
 public class CommonMarginInline {
 
-    public int marginTop;
-    public int marginBottom;
-    public int marginLeft;
-    public int marginRight;
-    public int spaceStart;
-    public int spaceEnd;
+    /**
+     * The "margin-top" property.
+     */
+    public Length marginTop;
+
+    /**
+     * The "margin-bottom" property.
+     */
+    public Length marginBottom;
+
+    /**
+     * The "margin-left" property.
+     */
+    public Length marginLeft;
+
+    /**
+     * The "margin-right" property.
+     */
+    public Length marginRight;
+
+    /**
+     * The "space-start" property.
+     */
+    public SpaceProperty spaceStart;
+
+    /**
+     * The "space-end" property.
+     */
+    public SpaceProperty spaceEnd;
+
+    public CommonMarginInline() {
+
+    }
+
+    /**
+     * Create a CommonMarginInline object.
+     * @param pList The PropertyList with propery values.
+     */
+    public CommonMarginInline(PropertyList pList) {
+        marginTop = pList.get(Constants.PR_MARGIN_TOP).getLength();
+        marginBottom = pList.get(Constants.PR_MARGIN_BOTTOM).getLength();
+        marginLeft = pList.get(Constants.PR_MARGIN_LEFT).getLength();
+        marginRight = pList.get(Constants.PR_MARGIN_RIGHT).getLength();
 
+        spaceStart = pList.get(Constants.PR_SPACE_START).getSpace();
+        spaceEnd = pList.get(Constants.PR_SPACE_END).getSpace();
+    }
 }