You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by bc...@apache.org on 2004/10/19 23:40:56 UTC
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties CommonAbsolutePosition.java CommonAural.java CommonBorderPaddingBackground.java CommonMarginInline.java
bckfnn 2004/10/19 14:40:56
Modified: src/java/org/apache/fop/fo/properties
CommonAbsolutePosition.java CommonAural.java
CommonBorderPaddingBackground.java
CommonMarginInline.java
Log:
Third phase of performance improvement.
- Added javadoc comment.
- Fixed the type of properties.
PR: 31699
Revision Changes Path
1.3 +39 -5 xml-fop/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java
Index: CommonAbsolutePosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommonAbsolutePosition.java 27 Feb 2004 17:45:44 -0000 1.2
+++ CommonAbsolutePosition.java 19 Oct 2004 21:40:56 -0000 1.3
@@ -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();
+ }
}
1.3 +83 -2 xml-fop/src/java/org/apache/fop/fo/properties/CommonAural.java
Index: CommonAural.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/CommonAural.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommonAural.java 27 Feb 2004 17:45:44 -0000 1.2
+++ CommonAural.java 19 Oct 2004 21:40:56 -0000 1.3
@@ -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) {
+ }
}
1.3 +2 -2 xml-fop/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
Index: CommonBorderPaddingBackground.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommonBorderPaddingBackground.java 18 Oct 2004 20:17:45 -0000 1.2
+++ CommonBorderPaddingBackground.java 19 Oct 2004 21:40:56 -0000 1.3
@@ -79,7 +79,7 @@
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) {
1.3 +51 -7 xml-fop/src/java/org/apache/fop/fo/properties/CommonMarginInline.java
Index: CommonMarginInline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/CommonMarginInline.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommonMarginInline.java 27 Feb 2004 17:45:44 -0000 1.2
+++ CommonMarginInline.java 19 Oct 2004 21:40:56 -0000 1.3
@@ -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 @@
*/
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();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org