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 pi...@apache.org on 2005/09/09 00:07:49 UTC
svn commit: r279656 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop:
apps/ area/ area/inline/ datatypes/ fo/expr/ fo/pagination/ fo/properties/
fonts/ layoutmgr/ layoutmgr/inline/ layoutmgr/list/ layoutmgr/table/ pdf/
render/java2d/ svg/ tools/antt...
Author: pietsch
Date: Thu Sep 8 15:06:48 2005
New Revision: 279656
URL: http://svn.apache.org/viewcvs?rev=279656&view=rev
Log:
Fixed javadoc errors.
Added a few TODOs.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NumericProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorTypeProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumLength.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FixedLength.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColLength.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthElement.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/MinOptMax.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java Thu Sep 8 15:06:48 2005
@@ -84,7 +84,7 @@
/**
* Set a location associated with the exception.
- * @param location the locator holding the location.
+ * @param locator the locator holding the location.
*/
public void setLocator(Locator locator) {
if (locator != null) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java Thu Sep 8 15:06:48 2005
@@ -177,7 +177,7 @@
* id reference.
*
* @see org.apache.fop.area.Resolvable#resolveIDRef(String, List)
- * @todo check to make sure works when multiple bookmark-items
+ * @todo check to make sure it works if multiple bookmark-items
* have the same idref
*/
public void resolveIDRef(String id, List pages) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java Thu Sep 8 15:06:48 2005
@@ -247,7 +247,7 @@
/**
* Construct a coordinate transformation matrix (CTM).
* @param absRefOrient absolute reference orientation
- * @param writingmode the writing mode
+ * @param writingMode the writing mode
* @param absVPrect absolute viewpoint rectangle
* @param reldims relative dimensions
* @return CTM the coordinate transformation matrix (CTM)
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java Thu Sep 8 15:06:48 2005
@@ -131,7 +131,7 @@
/**
* Set the parent for the child area.
*
- * @see org.apache.fop.area.inline.Area#addChildArea(Area)
+ * @see org.apache.fop.area.Area#addChildArea(Area)
*/
public void addChildArea(Area childArea) {
super.addChildArea(childArea);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java Thu Sep 8 15:06:48 2005
@@ -110,7 +110,9 @@
return 1.0;
}
- /** @see org.apache.fop.datatypes.PercentBase#getBaseLength() */
+ /**
+ * @see org.apache.fop.datatypes.PercentBase#getBaseLength(PercentBaseContext)
+ */
public int getBaseLength(PercentBaseContext context) throws PropertyException {
int baseLength = 0;
if (context != null) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java Thu Sep 8 15:06:48 2005
@@ -71,7 +71,7 @@
/**
* Returns the value of this numeric as an int.
- * @param conext The context for the length calculation (for percentage based lengths)
+ * @param context the context for the length calculation (for percentage based lengths)
* @return the value as an integer.
*/
public int getValue(PercentBaseContext context);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java Thu Sep 8 15:06:48 2005
@@ -44,7 +44,7 @@
/**
* Returns the value for the given lengthBase.
- * @see org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, fobj)
+ * @see org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, FObj)
*/
public int getBaseLength(int lengthBase, FObj fobj) {
// if its for us return our value otherwise delegate to parent context
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NumericProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NumericProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NumericProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NumericProperty.java Thu Sep 8 15:06:48 2005
@@ -61,9 +61,7 @@
}
/**
- * Return the value.
- * @param Evaluation context
- * @see Numeric#getNumericValue(Object)
+ * @see Numeric#getNumericValue(PercentBaseContext)
*/
public double getNumericValue(PercentBaseContext context) {
return value;
@@ -92,15 +90,14 @@
}
/**
- * Return the value of this numeric as a length in millipoints.
+ * @see org.apache.fop.datatypes.Numeric#getValue()
*/
public int getValue() {
return (int) value;
}
/**
- * Return the value of this numeric as a length in millipoints.
- * @param Evaluation context
+ * @see org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext)
*/
public int getValue(PercentBaseContext context) {
return (int) value;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java Thu Sep 8 15:06:48 2005
@@ -128,16 +128,14 @@
/**
* Return the resolved (calculated) value of the expression.
- * @see Numeric#getNumericValue()
+ * @see org.apache.fop.datatypes.Numeric#getNumericValue()
*/
public double getNumericValue() throws PropertyException {
return getResolved(null).getNumericValue(null);
}
/**
- * Return the value.
- * @param Evaluation context
- * @see Numeric#getNumericValue(Object)
+ * @see org.apache.fop.datatypes.Numeric#getNumericValue(PercentBaseContext)
*/
public double getNumericValue(PercentBaseContext context) throws PropertyException {
return getResolved(context).getNumericValue(context);
@@ -174,7 +172,7 @@
}
/**
- * Return a resolved length.
+ * @see org.apache.fop.datatypes.Numeric#getValue()
*/
public int getValue() {
try {
@@ -186,8 +184,7 @@
}
/**
- * Return the value of this numeric as a length in millipoints.
- * @param Evaluation context
+ * @see org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext)
*/
public int getValue(PercentBaseContext context) {
try {
@@ -199,7 +196,8 @@
}
/**
- * Return a string represention of the expression. Only used for debugging.
+ * Return a string represention of the expression. Only used for debugging.
+ * @return the string representation.
*/
public String toString() {
switch (operation) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java Thu Sep 8 15:06:48 2005
@@ -236,7 +236,7 @@
/**
* Sets the associated Declarations.
- * @param Declarations the Declarations to use
+ * @param declarations the Declarations to use
*/
public void setDeclarations(Declarations declarations) {
this.declarations = declarations;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java Thu Sep 8 15:06:48 2005
@@ -28,7 +28,7 @@
public class BoxPropShorthandParser extends GenericShorthandParser {
/**
- * @see org.apache.fop.fo.GenericShorthandParser#GenericShorthandParser()
+ * Default constructor.
*/
public BoxPropShorthandParser() {
}
@@ -38,7 +38,7 @@
* Set the given property based on the number of values set.
* Example: padding, border-width, border-color, border-style, margin
* @see org.apache.fop.fo.GenericShorthandParser#convertValueForProperty(
- * int, ListProperty, PropertyMaker, PropertyList)
+ * int, Property, PropertyMaker, PropertyList)
*/
protected Property convertValueForProperty(int propId,
Property property,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java Thu Sep 8 15:06:48 2005
@@ -32,7 +32,7 @@
public static class Maker extends PropertyMaker {
/**
- * @param propName name of property for which a Maker should be created
+ * @param propId the id of the property for which a Maker should be created
*/
public Maker(int propId) {
super(propId);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorTypeProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorTypeProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorTypeProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorTypeProperty.java Thu Sep 8 15:06:48 2005
@@ -57,7 +57,7 @@
public static class Maker extends PropertyMaker {
/**
- * @param propName name of property for which a Maker should be created
+ * @param propId the id of the property for which a Maker should be created
*/
public Maker(int propId) {
super(propId);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java Thu Sep 8 15:06:48 2005
@@ -93,7 +93,7 @@
* of compound property types, such as "space".
* Overridden by property maker subclasses which handle
* compound properties.
- * @param subprop The Constants ID of the component for which a Maker is to
+ * @param subpropId the id of the component for which a Maker is to
* returned, for example CP_OPTIMUM, if the FO attribute is
* space.optimum='10pt'.
* @return the Maker object specified
@@ -139,7 +139,7 @@
* the default value.
* @param subpropId The subproperty id of the property being retrieved.
* Is 0 when retriving a base property.
- * @param propertylist The PropertyList object being built for this FO.
+ * @param propertyList The PropertyList object being built for this FO.
* @param bTryInherit true if inherited properties should be examined.
* @param bTryDefault true if the default value should be returned.
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengthProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengthProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengthProperty.java Thu Sep 8 15:06:48 2005
@@ -39,7 +39,7 @@
public static class Maker extends CompoundPropertyMaker {
/**
- * @param name of property for which a Maker should be created
+ * @param propId the id of the property for which a Maker should be created
*/
public Maker(int propId) {
super(propId);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumLength.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumLength.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumLength.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumLength.java Thu Sep 8 15:06:48 2005
@@ -42,8 +42,7 @@
}
/**
- * Returns the length in 1/1000ths of a point (millipoints)
- * @return the length in millipoints
+ * @see org.apache.fop.datatypes.Numeric#getValue()
*/
public int getValue() {
log.error("getValue() called on " + enumProperty + " length");
@@ -51,9 +50,7 @@
}
/**
- * Returns the length in 1/1000ths of a point (millipoints)
- * @param Evaluation context
- * @return the length in millipoints
+ * @see org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext)
*/
public int getValue(PercentBaseContext context) {
log.error("getValue() called on " + enumProperty + " length");
@@ -61,8 +58,7 @@
}
/**
- * Returns the value as numeric.
- * @return the length in millipoints
+ * @see org.apache.fop.datatypes.Numeric#getNumericValue()
*/
public double getNumericValue() {
log.error("getNumericValue() called on " + enumProperty + " number");
@@ -70,9 +66,7 @@
}
/**
- * Returns the value as numeric.
- * @param context Evaluation context
- * @return the length in millipoints
+ * @see org.apache.fop.datatypes.Numeric#getNumericValue()
*/
public double getNumericValue(PercentBaseContext context) {
log.error("getNumericValue() called on " + enumProperty + " number");
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumProperty.java Thu Sep 8 15:06:48 2005
@@ -33,7 +33,7 @@
public static class Maker extends PropertyMaker {
/**
- * @param propName name of property for which a Maker should be created
+ * @param propId the id of the property for which a Maker should be created
*/
public Maker(int propId) {
super(propId);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FixedLength.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FixedLength.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FixedLength.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FixedLength.java Thu Sep 8 15:06:48 2005
@@ -58,6 +58,7 @@
* @param unit input unit specifier (in, cm, etc.)
*/
protected void convert(double dvalue, String unit) {
+ // TODO: the whole routine smells fishy.
int assumedResolution = 1; // points/pixel
@@ -71,6 +72,7 @@
// Do nothing.
// dvalue = dvalue;
} else if (unit.equals("mpt")) { //mpt is non-standard!!! mpt=millipoints
+ // TODO: this seems to be wrong.
// Do nothing.
// dvalue = dvalue;
} else if (unit.equals("pc")) {
@@ -80,6 +82,7 @@
* dvalue = dvalue * fontsize;
*/
} else if (unit.equals("px")) {
+ // TODO: get resolution from user agent?
dvalue = dvalue * assumedResolution;
} else {
dvalue = 0;
@@ -93,36 +96,28 @@
}
/**
- * Returns the length in 1/1000ths of a point (millipoints)
- * @return the length in millipoints
+ * @see org.apache.fop.datatypes.Numeric#getValue()
*/
public int getValue() {
return millipoints;
}
/**
- * Returns the length in 1/1000ths of a point (millipoints)
- * @param Evaluation context
- * @return the length in millipoints
+ * @see org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext)
*/
public int getValue(PercentBaseContext context) {
return millipoints;
}
/**
- * Returns the value as numeric.
- * @return the length in millipoints
- * @see Numeric#getNumericValue()
+ * @see org.apache.fop.datatypes.Numeric#getNumericValue()
*/
public double getNumericValue() {
return millipoints;
}
/**
- * Return the value of this Numeric.
- * @param context Evaluation context
- * @return the length in millipoints
- * @see Numeric#getNumericValue(Object)
+ * @see org.apache.fop.datatypes.Numeric#getNumericValue(PercentBaseContext)
*/
public double getNumericValue(PercentBaseContext context) {
return millipoints;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepProperty.java Thu Sep 8 15:06:48 2005
@@ -37,7 +37,7 @@
public static class Maker extends CompoundPropertyMaker {
/**
- * @param name name of property for which Maker should be created
+ * @param propId the id of the property for which a Maker should be created
*/
public Maker(int propId) {
super(propId);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthProperty.java Thu Sep 8 15:06:48 2005
@@ -37,7 +37,7 @@
private boolean autoOk = false;
/**
- * @param name name of property for which Maker should be created
+ * @param propId the id of the property for which a Maker should be created
*/
public Maker(int propId) {
super(propId);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java Thu Sep 8 15:06:48 2005
@@ -43,7 +43,7 @@
public static class Maker extends CompoundPropertyMaker {
/**
- * @param name name of property for which to create Maker
+ * @param propId the id of the property for which a Maker should be created
*/
public Maker(int propId) {
super(propId);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java Thu Sep 8 15:06:48 2005
@@ -24,9 +24,9 @@
/**
* A maker which calculates the line-height property.
- * This property maker is special because line-height inherit the specified
+ * This property maker is special because line-height inherits the specified
* value, instead of the computed value.
- * So when a line-height is create based on a attribute, the specified value
+ * So when a line-height is create based on an attribute, the specified value
* is stored in the property and in compute() the stored specified value of
* the nearest specified is used to recalculate the line-height.
*/
@@ -60,7 +60,7 @@
}
/**
- * @see SpaceProperty#convertProperty(Property, PropertyList, FObj)
+ * @see SpaceProperty.Maker#convertProperty(Property, PropertyList, FObj)
*/
public Property convertProperty(Property p,
PropertyList propertyList,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberProperty.java Thu Sep 8 15:06:48 2005
@@ -35,7 +35,7 @@
/**
* Constructor for NumberProperty.Maker
- * @param propName the name of the property
+ * @param propId the id of the property for which a Maker should be created
*/
public Maker(int propId) {
super(propId);
@@ -109,7 +109,7 @@
* Return the value of this Numeric.
* @param context Evaluation context
* @return The value as a double.
- * @see Numeric#getNumericValue(Object)
+ * @see Numeric#getNumericValue(PercentBaseContext)
*/
public double getNumericValue(PercentBaseContext context) {
return getNumericValue();
@@ -123,7 +123,7 @@
* Return the value
* @param context Evaluation context
* @return The value as an int.
- * @see Numeric#getValue(Object)
+ * @see Numeric#getValue(PercentBaseContext)
*/
public int getValue(PercentBaseContext context) {
return getValue();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java Thu Sep 8 15:06:48 2005
@@ -79,7 +79,6 @@
}
/**
- * Return the value of this Numeric.
* @see org.apache.fop.datatypes.Numeric#getNumericValue()
*/
public double getNumericValue() {
@@ -87,10 +86,7 @@
}
/**
- * Return the value of this Numeric.
- * @param context Evaluation context
- * @return the length in millipoints
- * @see Numeric#getNumericValue(Object)
+ * @see org.apache.fop.datatypes.Numeric#getNumericValue(PercentBaseContext)
*/
public double getNumericValue(PercentBaseContext context) {
try {
@@ -111,8 +107,7 @@
}
/**
- * Return the value of this numeric as a length in millipoints.
- * @param Evaluation context
+ * @see org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext)
*/
public int getValue(PercentBaseContext context) {
return (int) getNumericValue(context);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java Thu Sep 8 15:06:48 2005
@@ -163,7 +163,7 @@
/**
* Set the shorthand datatype parser.
- * @param subproperty
+ * @param parser the shorthand parser
*/
public void setDatatypeParser(ShorthandParser parser) {
datatypeParser = parser;
@@ -197,11 +197,11 @@
}
/**
- * Set the byShorthand flag which only is applicable for subproperty
+ * Set the setByShorthand flag which only is applicable for subproperty
* makers. It should be true for the subproperties which must be
* assigned a value when the base property is assigned a attribute
* value directly.
- * @param defaultValue
+ * @param setByShorthand
*/
public void setByShorthand(boolean setByShorthand) {
this.setByShorthand = setByShorthand;
@@ -273,7 +273,7 @@
* the default value.
* @param subpropId The subproperty id of the property being retrieved.
* Is 0 when retriving a base property.
- * @param propertylist The PropertyList object being built for this FO.
+ * @param propertyList The PropertyList object being built for this FO.
* @param bTryInherit true if inherited properties should be examined.
* @param bTryDefault true if the default value should be returned.
*/
@@ -319,7 +319,7 @@
* property.
* @param p A property value for a compound property type such as
* SpaceProperty.
- * @param subprop The Constants ID of the component whose value is to be
+ * @param subpropId the id of the component whose value is to be
* returned.
* NOTE: this is only to ease porting when calls are made to
* PropertyList.get() using a component name of a compound property,
@@ -503,8 +503,8 @@
* initializers "thin", "medium", or "thick". The FOPropertyMapping
* file specifies a length value equivalent for these keywords,
* such as "0.5pt" for "thin".
- * @param value The string value of property attribute.
- * @return A String containging a parseable equivalent or null if
+ * @param keyword the string value of property attribute.
+ * @return a String containing a parseable equivalent or null if
* the passed value isn't a keyword initializer for this Property.
*/
protected String checkValueKeywords(String keyword) {
@@ -514,6 +514,7 @@
return value;
}
}
+ // TODO: should return null here?
return keyword;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProperty.java Thu Sep 8 15:06:48 2005
@@ -38,7 +38,7 @@
public static class Maker extends CompoundPropertyMaker {
/**
- * @param name name of the property whose Maker is to be created
+ * @param propId the id of the property for which a Maker should be created
*/
public Maker(int propId) {
super(propId);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java Thu Sep 8 15:06:48 2005
@@ -33,7 +33,7 @@
public static class Maker extends PropertyMaker {
/**
- * @param propName name of property for which to create a Maker
+ * @param propId the id of the property for which a Maker should be created
*/
public Maker(int propId) {
super(propId);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColLength.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColLength.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColLength.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColLength.java Thu Sep 8 15:06:48 2005
@@ -78,10 +78,7 @@
}
/**
- * Return the value of this Numeric.
- * @param context Evaluation context
- * @return the value
- * @see Numeric#getNumericValue(Object)
+ * @see org.apache.fop.datatypes.Numeric#getNumericValue(PercentBaseContext)
*/
public double getNumericValue(PercentBaseContext context) {
return getNumericValue();
@@ -96,9 +93,7 @@
}
/**
- * Returns the length in 1/1000ths of a point (millipoints)
- * @param Evaluation context
- * @return the length in millipoints
+ * @see org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext)
*/
public int getValue(PercentBaseContext context) {
return getValue();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java Thu Sep 8 15:06:48 2005
@@ -164,10 +164,9 @@
}
/**
- * Add fonts from configuration file starting with
- * internalnames F<num>
+ * Add fonts from configuration file starting with internal name F<num>.
* @param fontInfo the font info object to set up
- * @param fontInfos ???
+ * @param fontInfoList
* @param num starting index for internal font numbering
*/
public static void addConfiguredFonts(FontInfo fontInfo, List fontInfoList, int num) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java Thu Sep 8 15:06:48 2005
@@ -82,7 +82,7 @@
private int contentAreaIPD = 0;
/**
- * @param the fo this LM deals with
+ * @param node the fo this LM deals with
*/
public BlockStackingLayoutManager(FObj node) {
super(node);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthElement.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthElement.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthElement.java Thu Sep 8 15:06:48 2005
@@ -38,7 +38,6 @@
* Create a new KnuthElement.
* This class being abstract, this can be called only by subclasses.
*
- * @param t the type of this element (one of the KNUTH_* constants)
* @param w the width of this element
* @param pos the Position stored in this element
* @param bAux is this an auxiliary element?
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java Thu Sep 8 15:06:48 2005
@@ -44,7 +44,6 @@
/**
* Constructor
* @param node the formatting object that creates this area
- * @param parent the parent layout manager
*/
public AbstractGraphicsLayoutManager(AbstractGraphics node) {
super(node);
@@ -242,7 +241,7 @@
* to take the border/padding into account as well.
* @param area the inline area to be updated
* @param context the layout context used for adding the area
- * @see LeafNodeLayoutManager#offsetArea(InlineArae, LayoutContext)
+ * @see LeafNodeLayoutManager#offsetArea(InlineArea, LayoutContext)
*/
protected void offsetArea(InlineArea area, LayoutContext context) {
int bpd = area.getBPD()
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java Thu Sep 8 15:06:48 2005
@@ -74,7 +74,7 @@
this.parentLM = pslm;
holder = new LineArea();
- setUserAgent(foTitle.getUserAgent());
+ // setUserAgent(foTitle.getUserAgent());
// use special layout manager to add the inline areas
// to the Title.
@@ -186,18 +186,20 @@
*
* @param ua the user agent
*/
- public void setUserAgent(FOUserAgent ua) {
- userAgent = ua;
- }
+// public void setUserAgent(FOUserAgent ua) {
+// userAgent = ua;
+// }
/**
* @see org.apache.fop.layoutmgr.LayoutManager#getUserAgent()
*/
- public FOUserAgent getUserAgent() {
- return userAgent;
- }
+// public FOUserAgent getUserAgent() {
+// return userAgent;
+// }
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /**
+ * @see org.apache.fop.layoutmgr.LayoutManager#setParent(LayoutManager)
+ */
public void setParent(LayoutManager lm) {
parentLM = lm;
}
@@ -206,30 +208,36 @@
return this.parentLM;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /**
+ * @see org.apache.fop.layoutmgr.LayoutManager#isFinished()
+ */
public boolean isFinished() {
return false;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /**
+ * @see org.apache.fop.layoutmgr.LayoutManager#setFinished(boolean)
+ */
public void setFinished(boolean isFinished) {
//to be done
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /**
+ * @see org.apache.fop.layoutmgr.LayoutManager#resetPosition(Position)
+ */
public void resetPosition(Position position) {
//to be done
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#createNextChildLMs
+ * @see org.apache.fop.layoutmgr.LayoutManager#createNextChildLMs(int)
*/
public boolean createNextChildLMs(int pos) {
return false;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getChildLMs
+ * @see org.apache.fop.layoutmgr.LayoutManager#getChildLMs()
*/
public List getChildLMs() {
List childLMs = new ArrayList(1);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java Thu Sep 8 15:06:48 2005
@@ -117,7 +117,7 @@
return inlineProps.spaceEnd;
}
- /** @see org.apache.fop.layoutmgr.inline.InlineStackingLayoutManager#createArea() */
+ /** @see org.apache.fop.layoutmgr.inline.InlineLayoutManager#createArea(boolean) */
protected InlineArea createArea(boolean bInlineParent) {
InlineArea area;
if (bInlineParent) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java Thu Sep 8 15:06:48 2005
@@ -380,8 +380,9 @@
* @param str the string for the TextArea
* @param width the MinOptMax width of the content
* @param adjust the total ipd adjustment with respect to the optimal width
- * @param base the baseline position
- * @return the new word area
+ * @param context the layout context
+ * @param spaceDiff unused
+ * @return the new text area
*/
protected TextArea createTextArea(String str, MinOptMax width, int adjust,
LayoutContext context, int spaceDiff) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java Thu Sep 8 15:06:48 2005
@@ -73,7 +73,6 @@
/**
* Create a new list block layout manager.
* @param node list-block to create the layout manager for
- * @param parent the parent layout manager
*/
public ListBlockLayoutManager(ListBlock node) {
super(node);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java Thu Sep 8 15:06:48 2005
@@ -48,12 +48,13 @@
//public static final int FIRST_ROW_IN_GROUP = 4;
/** Indicates that the cell is/end in the last row of a body/table-header/table-footer */
//public static final int LAST_ROW_IN_GROUP = 8;
-
+
+ // TODO: this is not MT safe. Must be removed.
private static CollapsingBorderModel collapse = null;
private static CollapsingBorderModel collapseWithPrecedence = null;
/**
- * @param cellLM the cell
+ * @param borderCollapse border collapse control
* @return the border model for the cell
*/
public static CollapsingBorderModel getBorderModelFor(int borderCollapse) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java Thu Sep 8 15:06:48 2005
@@ -1135,7 +1135,7 @@
// --------- Property Resolution related functions --------- //
/**
- * @see org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, fobj)
+ * @see org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, FObj)
*/
public int getBaseLength(int lengthBase, FObj fobj) {
return tableLM.getBaseLength(lengthBase, fobj);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManager.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManager.java Thu Sep 8 15:06:48 2005
@@ -76,7 +76,6 @@
* the necessary cryptographic support is available.
* @param params the PDF encryption params or null to disable encryption
* @param pdf the PDF document to setup encryption for
- * @param log the logger to send warnings to
*/
public static void setupPDFEncryption(PDFEncryptionParams params,
PDFDocument pdf) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Thu Sep 8 15:06:48 2005
@@ -204,22 +204,31 @@
}
}
- /** @return The 0-based current page number */
+ /**
+ * @return The 0-based current page number
+ */
public int getCurrentPageNumber() {
return currentPageNumber;
}
- /** @param The 0-based current page number */
+ /**
+ * @param c the 0-based current page number
+ */
public void setCurrentPageNumber(int c) {
this.currentPageNumber = c;
}
- /** @return The 0-based total number of rendered pages */
+ /**
+ * @return The 0-based total number of rendered pages
+ */
public int getNumberOfPages() {
return numberOfPages;
}
- /** clears the ViewportList, in case the document is reloaded */
+ /**
+ * Clears the ViewportList.
+ * Used if the document is reloaded.
+ */
public void clearViewportList() {
pageViewportList.clear();
setCurrentPageNumber(0);
@@ -238,7 +247,8 @@
*/
public void renderPage(PageViewport pageViewport)
throws IOException, FOPException {
- pageViewportList.add(pageViewport.clone()); // FIXME clone
+ // TODO clone
+ pageViewportList.add(pageViewport.clone());
currentPageNumber++;
}
@@ -547,7 +557,7 @@
* Draw the background and borders. This draws the background and border
* traits for an area given the position.
*
- * @param block the area to get the traits from
+ * @param area the area whose traits are used
* @param startx the start x position
* @param starty the start y position
* @param width the width of the area
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java Thu Sep 8 15:06:48 2005
@@ -46,9 +46,8 @@
/**
* Creates a new SVGUserAgent.
- * @param log an Commons logging instance
- * @param pixelUnitToMM The pixel to millimeter conversion factor
- * currently in effect
+ * @param pixelUnitToMM the pixel to millimeter conversion factor
+ * currently in effect
* @param at the current transform
*/
public SVGUserAgent(float pixelUnitToMM, AffineTransform at) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java Thu Sep 8 15:06:48 2005
@@ -80,14 +80,16 @@
/**
* Compares two files to see if they are equal
- * @param true if files are same, false otherwise
+ * @param f1 first file to compare
+ * @param f2 second file to compare
+ * @return true if files are same, false otherwise
*/
public static boolean compareFiles(File f1, File f2) throws IOException {
return (compareFileSize(f1, f2) && compareBytes(f1, f2));
}
/**
- * Does a byte compare of two files
+ * Compare the contents of two files.
* @param true if files are same byte-by-byte, false otherwise
*/
private static boolean compareBytes(File file1, File file2) throws IOException {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/MinOptMax.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/MinOptMax.java?rev=279656&r1=279655&r2=279656&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/MinOptMax.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/MinOptMax.java Thu Sep 8 15:06:48 2005
@@ -55,17 +55,16 @@
* @param max the maximum value
*/
public MinOptMax(int min, int opt, int max) {
+ // TODO: assert min<=opt<=max
this.min = min;
this.opt = opt;
this.max = max;
}
/**
- * New min/opt/max with the three values.
+ * Copy constructor.
*
- * @param min the minimum value
- * @param opt the optimum value
- * @param max the maximum value
+ * @param op the MinOptMax object to copy
*/
public MinOptMax(MinOptMax op) {
this.min = op.min;
@@ -73,6 +72,7 @@
this.max = op.max;
}
+ // TODO: remove this.
/**
* @see java.lang.Object#clone()
*/
@@ -114,6 +114,7 @@
* @return MinOptMax new instance
*/
public static MinOptMax multiply(MinOptMax op1, double mult) {
+ // TODO: assert mult>0
return new MinOptMax((int)(op1.min * mult),
(int)(op1.opt * mult), (int)(op1.max * mult));
}
@@ -129,18 +130,21 @@
}
/**
- * Adds another MinOptMax instance to this one.
- * @param op the other instance
+ * Adds min, opt and max to their counterpart components.
+ * @param min the value to add to the minimum value
+ * @param opt the value to add to the optimum value
+ * @param max the value to add to the maximum value
*/
public void add(int min, int opt, int max) {
this.min += min;
this.opt += opt;
this.max += max;
+ // TODO: assert min<=opt<=max
}
/**
- * Adds another MinOptMax instance to this one.
- * @param op the other instance
+ * Adds a length to all components.
+ * @param len the length to add
*/
public void add(int len) {
this.min += len;
@@ -150,7 +154,7 @@
/**
- * Subtracts from this instance using another.
+ * Subtracts another MinOptMax instance from this one.
* @param op the other instance
*/
public void subtract(MinOptMax op) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
Re: svn commit: r279656 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop: apps/ area/ area/inline/ datatypes/ fo/expr/ fo/pagination/ fo/properties/ fonts/ layoutmgr/ layoutmgr/inline/ layoutmgr/list/ layoutmgr/table/ pdf/ render/java2d/ svg/ tools/antt...
Posted by Manuel Mall <mm...@arcus.com.au>.
After applying this update I get:
compile-java:
[mkdir] Created dir: /home/mm/fop-ref/build/classes
[javac] Compiling 655 source files to /home/mm/fop-ref/build/classes
[javac] /home/mm/fop-ref/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java:142:
cannot find symbol
[javac] symbol : method
setUserAgent(org.apache.fop.apps.FOUserAgent)
[javac] location: class
org.apache.fop.layoutmgr.inline.ContentLayoutManager
[javac] clm.setUserAgent(fobj.getUserAgent());
[javac] ^
[javac] 1 error
Manuel
On Fri, 9 Sep 2005 06:07 am, pietsch@apache.org wrote:
> Author: pietsch
> Date: Thu Sep 8 15:06:48 2005
> New Revision: 279656
>
> URL: http://svn.apache.org/viewcvs?rev=279656&view=rev
> Log:
> Fixed javadoc errors.
> Added a few TODOs.
>
> Modified:
>
> xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.
>java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.ja
>va
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercent
>BaseContext.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NumericProperty
>.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumeric
>Property.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BoxPropSh
>orthandParser.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Character
>Property.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorType
>Property.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundP
>ropertyMaker.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengt
>hProperty.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumLengt
>h.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumPrope
>rty.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FixedLeng
>th.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepPrope
>rty.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthPro
>perty.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRan
>geProperty.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LineHeigh
>tPropertyMaker.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberPro
>perty.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLe
>ngth.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyM
>aker.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProp
>erty.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringPro
>perty.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColL
>ength.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStacking
>LayoutManager.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthElement.
>java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Abstra
>ctGraphicsLayoutManager.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Conten
>tLayoutManager.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Inline
>LayoutManager.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLa
>youtManager.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBloc
>kLayoutManager.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/Collaps
>ingBorderModel.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCo
>ntentLayoutManager.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManage
>r.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRen
>derer.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileComp
>are.java
> xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/MinOptMax.java
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java
> URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/apps/FOPException.java?rev=279656&r1=279655&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java
> (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java
> Thu Sep 8 15:06:48 2005 @@ -84,7 +84,7 @@
>
> /**
> * Set a location associated with the exception.
> - * @param location the locator holding the location.
> + * @param locator the locator holding the location.
> */
> public void setLocator(Locator locator) {
> if (locator != null) {
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java
> URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/area/BookmarkData.java?rev=279656&r1=279655&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java
> (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java
> Thu Sep 8 15:06:48 2005 @@ -177,7 +177,7 @@
> * id reference.
> *
> * @see org.apache.fop.area.Resolvable#resolveIDRef(String,
> List) - * @todo check to make sure works when multiple
> bookmark-items + * @todo check to make sure it works if multiple
> bookmark-items * have the same idref
> */
> public void resolveIDRef(String id, List pages) {
>
> Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java
> URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/area/CTM.java?rev=279656&r1=279655&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java
> (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java Thu Sep
> 8 15:06:48 2005 @@ -247,7 +247,7 @@
> /**
> * Construct a coordinate transformation matrix (CTM).
> * @param absRefOrient absolute reference orientation
> - * @param writingmode the writing mode
> + * @param writingMode the writing mode
> * @param absVPrect absolute viewpoint rectangle
> * @param reldims relative dimensions
> * @return CTM the coordinate transformation matrix (CTM)
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.
>java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/area/inline/InlineArea.java?rev=279656&r1=279655&r2=279656&view
>=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.
>java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.
>java Thu Sep 8 15:06:48 2005 @@ -131,7 +131,7 @@
> /**
> * Set the parent for the child area.
> *
> - * @see org.apache.fop.area.inline.Area#addChildArea(Area)
> + * @see org.apache.fop.area.Area#addChildArea(Area)
> */
> public void addChildArea(Area childArea) {
> super.addChildArea(childArea);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.ja
>va URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/datatypes/LengthBase.java?rev=279656&r1=279655&r2=279656&view=d
>iff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.ja
>va (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.ja
>va Thu Sep 8 15:06:48 2005 @@ -110,7 +110,9 @@
> return 1.0;
> }
>
> - /** @see org.apache.fop.datatypes.PercentBase#getBaseLength() */
> + /**
> + * @see
> org.apache.fop.datatypes.PercentBase#getBaseLength(PercentBaseContext
>) + */
> public int getBaseLength(PercentBaseContext context) throws
> PropertyException { int baseLength = 0;
> if (context != null) {
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java
> URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/datatypes/Numeric.java?rev=279656&r1=279655&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java
> (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java
> Thu Sep 8 15:06:48 2005 @@ -71,7 +71,7 @@
>
> /**
> * Returns the value of this numeric as an int.
> - * @param conext The context for the length calculation (for
> percentage based lengths) + * @param context the context for the
> length calculation (for percentage based lengths) * @return the value
> as an integer.
> */
> public int getValue(PercentBaseContext context);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercent
>BaseContext.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/datatypes/SimplePercentBaseContext.java?rev=279656&r1=279655&r2
>=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercent
>BaseContext.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercent
>BaseContext.java Thu Sep 8 15:06:48 2005 @@ -44,7 +44,7 @@
>
> /**
> * Returns the value for the given lengthBase.
> - * @see
> org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, fobj)
> + * @see
> org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, FObj)
> */
> public int getBaseLength(int lengthBase, FObj fobj) {
> // if its for us return our value otherwise delegate to
> parent context
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NumericProperty
>.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/expr/NumericProperty.java?rev=279656&r1=279655&r2=279656&vie
>w=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NumericProperty
>.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NumericProperty
>.java Thu Sep 8 15:06:48 2005 @@ -61,9 +61,7 @@
> }
>
> /**
> - * Return the value.
> - * @param Evaluation context
> - * @see Numeric#getNumericValue(Object)
> + * @see Numeric#getNumericValue(PercentBaseContext)
> */
> public double getNumericValue(PercentBaseContext context) {
> return value;
> @@ -92,15 +90,14 @@
> }
>
> /**
> - * Return the value of this numeric as a length in millipoints.
> + * @see org.apache.fop.datatypes.Numeric#getValue()
> */
> public int getValue() {
> return (int) value;
> }
>
> /**
> - * Return the value of this numeric as a length in millipoints.
> - * @param Evaluation context
> + * @see
> org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext) */
> public int getValue(PercentBaseContext context) {
> return (int) value;
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumeric
>Property.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/expr/RelativeNumericProperty.java?rev=279656&r1=279655&r2=27
>9656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumeric
>Property.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumeric
>Property.java Thu Sep 8 15:06:48 2005 @@ -128,16 +128,14 @@
>
> /**
> * Return the resolved (calculated) value of the expression.
> - * @see Numeric#getNumericValue()
> + * @see org.apache.fop.datatypes.Numeric#getNumericValue()
> */
> public double getNumericValue() throws PropertyException {
> return getResolved(null).getNumericValue(null);
> }
>
> /**
> - * Return the value.
> - * @param Evaluation context
> - * @see Numeric#getNumericValue(Object)
> + * @see
> org.apache.fop.datatypes.Numeric#getNumericValue(PercentBaseContext)
> */
> public double getNumericValue(PercentBaseContext context) throws
> PropertyException { return
> getResolved(context).getNumericValue(context); @@ -174,7 +172,7 @@
> }
>
> /**
> - * Return a resolved length.
> + * @see org.apache.fop.datatypes.Numeric#getValue()
> */
> public int getValue() {
> try {
> @@ -186,8 +184,7 @@
> }
>
> /**
> - * Return the value of this numeric as a length in millipoints.
> - * @param Evaluation context
> + * @see
> org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext) */
> public int getValue(PercentBaseContext context) {
> try {
> @@ -199,7 +196,8 @@
> }
>
> /**
> - * Return a string represention of the expression. Only used for
> debugging. + * Return a string represention of the expression.
> Only used for debugging. + * @return the string representation.
> */
> public String toString() {
> switch (operation) {
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java
> URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/pagination/Root.java?rev=279656&r1=279655&r2=279656&view=dif
>f
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java
> (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Root.java
> Thu Sep 8 15:06:48 2005 @@ -236,7 +236,7 @@
>
> /**
> * Sets the associated Declarations.
> - * @param Declarations the Declarations to use
> + * @param declarations the Declarations to use
> */
> public void setDeclarations(Declarations declarations) {
> this.declarations = declarations;
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BoxPropSh
>orthandParser.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/BoxPropShorthandParser.java?rev=279656&r1=279655&
>r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BoxPropSh
>orthandParser.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/BoxPropSh
>orthandParser.java Thu Sep 8 15:06:48 2005 @@ -28,7 +28,7 @@
> public class BoxPropShorthandParser extends GenericShorthandParser {
>
> /**
> - * @see
> org.apache.fop.fo.GenericShorthandParser#GenericShorthandParser() +
> * Default constructor.
> */
> public BoxPropShorthandParser() {
> }
> @@ -38,7 +38,7 @@
> * Set the given property based on the number of values set.
> * Example: padding, border-width, border-color, border-style,
> margin * @see
> org.apache.fop.fo.GenericShorthandParser#convertValueForProperty( -
> * int, ListProperty, PropertyMaker, PropertyList)
> + * int, Property, PropertyMaker, PropertyList)
> */
> protected Property convertValueForProperty(int propId,
> Property property,
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Character
>Property.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/CharacterProperty.java?rev=279656&r1=279655&r2=27
>9656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Character
>Property.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/Character
>Property.java Thu Sep 8 15:06:48 2005 @@ -32,7 +32,7 @@
> public static class Maker extends PropertyMaker {
>
> /**
> - * @param propName name of property for which a Maker should
> be created + * @param propId the id of the property for which
> a Maker should be created */
> public Maker(int propId) {
> super(propId);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorType
>Property.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/ColorTypeProperty.java?rev=279656&r1=279655&r2=27
>9656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorType
>Property.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/ColorType
>Property.java Thu Sep 8 15:06:48 2005 @@ -57,7 +57,7 @@
> public static class Maker extends PropertyMaker {
>
> /**
> - * @param propName name of property for which a Maker should
> be created + * @param propId the id of the property for which
> a Maker should be created */
> public Maker(int propId) {
> super(propId);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundP
>ropertyMaker.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/CompoundPropertyMaker.java?rev=279656&r1=279655&r
>2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundP
>ropertyMaker.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CompoundP
>ropertyMaker.java Thu Sep 8 15:06:48 2005 @@ -93,7 +93,7 @@
> * of compound property types, such as "space".
> * Overridden by property maker subclasses which handle
> * compound properties.
> - * @param subprop The Constants ID of the component for which a
> Maker is to + * @param subpropId the id of the component for
> which a Maker is to * returned, for example CP_OPTIMUM, if the FO
> attribute is * space.optimum='10pt'.
> * @return the Maker object specified
> @@ -139,7 +139,7 @@
> * the default value.
> * @param subpropId The subproperty id of the property being
> retrieved. * Is 0 when retriving a base property.
> - * @param propertylist The PropertyList object being built for
> this FO. + * @param propertyList The PropertyList object being
> built for this FO. * @param bTryInherit true if inherited properties
> should be examined. * @param bTryDefault true if the default value
> should be returned. */
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengt
>hProperty.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/CondLengthProperty.java?rev=279656&r1=279655&r2=2
>79656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengt
>hProperty.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CondLengt
>hProperty.java Thu Sep 8 15:06:48 2005 @@ -39,7 +39,7 @@
> public static class Maker extends CompoundPropertyMaker {
>
> /**
> - * @param name of property for which a Maker should be
> created + * @param propId the id of the property for which a
> Maker should be created */
> public Maker(int propId) {
> super(propId);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumLengt
>h.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/EnumLength.java?rev=279656&r1=279655&r2=279656&vi
>ew=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumLengt
>h.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumLengt
>h.java Thu Sep 8 15:06:48 2005 @@ -42,8 +42,7 @@
> }
>
> /**
> - * Returns the length in 1/1000ths of a point (millipoints)
> - * @return the length in millipoints
> + * @see org.apache.fop.datatypes.Numeric#getValue()
> */
> public int getValue() {
> log.error("getValue() called on " + enumProperty + "
> length"); @@ -51,9 +50,7 @@
> }
>
> /**
> - * Returns the length in 1/1000ths of a point (millipoints)
> - * @param Evaluation context
> - * @return the length in millipoints
> + * @see
> org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext) */
> public int getValue(PercentBaseContext context) {
> log.error("getValue() called on " + enumProperty + "
> length"); @@ -61,8 +58,7 @@
> }
>
> /**
> - * Returns the value as numeric.
> - * @return the length in millipoints
> + * @see org.apache.fop.datatypes.Numeric#getNumericValue()
> */
> public double getNumericValue() {
> log.error("getNumericValue() called on " + enumProperty + "
> number"); @@ -70,9 +66,7 @@
> }
>
> /**
> - * Returns the value as numeric.
> - * @param context Evaluation context
> - * @return the length in millipoints
> + * @see org.apache.fop.datatypes.Numeric#getNumericValue()
> */
> public double getNumericValue(PercentBaseContext context) {
> log.error("getNumericValue() called on " + enumProperty + "
> number");
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumPrope
>rty.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/EnumProperty.java?rev=279656&r1=279655&r2=279656&
>view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumPrope
>rty.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/EnumPrope
>rty.java Thu Sep 8 15:06:48 2005 @@ -33,7 +33,7 @@
> public static class Maker extends PropertyMaker {
>
> /**
> - * @param propName name of property for which a Maker should
> be created + * @param propId the id of the property for which
> a Maker should be created */
> public Maker(int propId) {
> super(propId);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FixedLeng
>th.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/FixedLength.java?rev=279656&r1=279655&r2=279656&v
>iew=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FixedLeng
>th.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FixedLeng
>th.java Thu Sep 8 15:06:48 2005 @@ -58,6 +58,7 @@
> * @param unit input unit specifier (in, cm, etc.)
> */
> protected void convert(double dvalue, String unit) {
> + // TODO: the whole routine smells fishy.
>
> int assumedResolution = 1; // points/pixel
>
> @@ -71,6 +72,7 @@
> // Do nothing.
> // dvalue = dvalue;
> } else if (unit.equals("mpt")) { //mpt is non-standard!!!
> mpt=millipoints + // TODO: this seems to be wrong.
> // Do nothing.
> // dvalue = dvalue;
> } else if (unit.equals("pc")) {
> @@ -80,6 +82,7 @@
> * dvalue = dvalue * fontsize;
> */
> } else if (unit.equals("px")) {
> + // TODO: get resolution from user agent?
> dvalue = dvalue * assumedResolution;
> } else {
> dvalue = 0;
> @@ -93,36 +96,28 @@
> }
>
> /**
> - * Returns the length in 1/1000ths of a point (millipoints)
> - * @return the length in millipoints
> + * @see org.apache.fop.datatypes.Numeric#getValue()
> */
> public int getValue() {
> return millipoints;
> }
>
> /**
> - * Returns the length in 1/1000ths of a point (millipoints)
> - * @param Evaluation context
> - * @return the length in millipoints
> + * @see
> org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext) */
> public int getValue(PercentBaseContext context) {
> return millipoints;
> }
>
> /**
> - * Returns the value as numeric.
> - * @return the length in millipoints
> - * @see Numeric#getNumericValue()
> + * @see org.apache.fop.datatypes.Numeric#getNumericValue()
> */
> public double getNumericValue() {
> return millipoints;
> }
>
> /**
> - * Return the value of this Numeric.
> - * @param context Evaluation context
> - * @return the length in millipoints
> - * @see Numeric#getNumericValue(Object)
> + * @see
> org.apache.fop.datatypes.Numeric#getNumericValue(PercentBaseContext)
> */
> public double getNumericValue(PercentBaseContext context) {
> return millipoints;
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepPrope
>rty.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/KeepProperty.java?rev=279656&r1=279655&r2=279656&
>view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepPrope
>rty.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/KeepPrope
>rty.java Thu Sep 8 15:06:48 2005 @@ -37,7 +37,7 @@
> public static class Maker extends CompoundPropertyMaker {
>
> /**
> - * @param name name of property for which Maker should be
> created + * @param propId the id of the property for which a
> Maker should be created */
> public Maker(int propId) {
> super(propId);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthPro
>perty.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/LengthProperty.java?rev=279656&r1=279655&r2=27965
>6&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthPro
>perty.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthPro
>perty.java Thu Sep 8 15:06:48 2005 @@ -37,7 +37,7 @@
> private boolean autoOk = false;
>
> /**
> - * @param name name of property for which Maker should be
> created + * @param propId the id of the property for which a
> Maker should be created */
> public Maker(int propId) {
> super(propId);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRan
>geProperty.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/LengthRangeProperty.java?rev=279656&r1=279655&r2=
>279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRan
>geProperty.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthRan
>geProperty.java Thu Sep 8 15:06:48 2005 @@ -43,7 +43,7 @@
> public static class Maker extends CompoundPropertyMaker {
>
> /**
> - * @param name name of property for which to create Maker
> + * @param propId the id of the property for which a Maker
> should be created */
> public Maker(int propId) {
> super(propId);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LineHeigh
>tPropertyMaker.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/LineHeightPropertyMaker.java?rev=279656&r1=279655
>&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LineHeigh
>tPropertyMaker.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LineHeigh
>tPropertyMaker.java Thu Sep 8 15:06:48 2005 @@ -24,9 +24,9 @@
>
> /**
> * A maker which calculates the line-height property.
> - * This property maker is special because line-height inherit the
> specified + * This property maker is special because line-height
> inherits the specified * value, instead of the computed value.
> - * So when a line-height is create based on a attribute, the
> specified value + * So when a line-height is create based on an
> attribute, the specified value * is stored in the property and in
> compute() the stored specified value of * the nearest specified is
> used to recalculate the line-height. */
> @@ -60,7 +60,7 @@
> }
>
> /**
> - * @see SpaceProperty#convertProperty(Property, PropertyList,
> FObj) + * @see SpaceProperty.Maker#convertProperty(Property,
> PropertyList, FObj) */
> public Property convertProperty(Property p,
> PropertyList propertyList,
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberPro
>perty.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/NumberProperty.java?rev=279656&r1=279655&r2=27965
>6&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberPro
>perty.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/NumberPro
>perty.java Thu Sep 8 15:06:48 2005 @@ -35,7 +35,7 @@
>
> /**
> * Constructor for NumberProperty.Maker
> - * @param propName the name of the property
> + * @param propId the id of the property for which a Maker
> should be created */
> public Maker(int propId) {
> super(propId);
> @@ -109,7 +109,7 @@
> * Return the value of this Numeric.
> * @param context Evaluation context
> * @return The value as a double.
> - * @see Numeric#getNumericValue(Object)
> + * @see Numeric#getNumericValue(PercentBaseContext)
> */
> public double getNumericValue(PercentBaseContext context) {
> return getNumericValue();
> @@ -123,7 +123,7 @@
> * Return the value
> * @param context Evaluation context
> * @return The value as an int.
> - * @see Numeric#getValue(Object)
> + * @see Numeric#getValue(PercentBaseContext)
> */
> public int getValue(PercentBaseContext context) {
> return getValue();
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLe
>ngth.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/PercentLength.java?rev=279656&r1=279655&r2=279656
>&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLe
>ngth.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLe
>ngth.java Thu Sep 8 15:06:48 2005 @@ -79,7 +79,6 @@
> }
>
> /**
> - * Return the value of this Numeric.
> * @see org.apache.fop.datatypes.Numeric#getNumericValue()
> */
> public double getNumericValue() {
> @@ -87,10 +86,7 @@
> }
>
> /**
> - * Return the value of this Numeric.
> - * @param context Evaluation context
> - * @return the length in millipoints
> - * @see Numeric#getNumericValue(Object)
> + * @see
> org.apache.fop.datatypes.Numeric#getNumericValue(PercentBaseContext)
> */
> public double getNumericValue(PercentBaseContext context) {
> try {
> @@ -111,8 +107,7 @@
> }
>
> /**
> - * Return the value of this numeric as a length in millipoints.
> - * @param Evaluation context
> + * @see
> org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext) */
> public int getValue(PercentBaseContext context) {
> return (int) getNumericValue(context);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyM
>aker.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/PropertyMaker.java?rev=279656&r1=279655&r2=279656
>&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyM
>aker.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyM
>aker.java Thu Sep 8 15:06:48 2005 @@ -163,7 +163,7 @@
>
> /**
> * Set the shorthand datatype parser.
> - * @param subproperty
> + * @param parser the shorthand parser
> */
> public void setDatatypeParser(ShorthandParser parser) {
> datatypeParser = parser;
> @@ -197,11 +197,11 @@
> }
>
> /**
> - * Set the byShorthand flag which only is applicable for
> subproperty + * Set the setByShorthand flag which only is
> applicable for subproperty * makers. It should be true for the
> subproperties which must be * assigned a value when the base property
> is assigned a attribute * value directly.
> - * @param defaultValue
> + * @param setByShorthand
> */
> public void setByShorthand(boolean setByShorthand) {
> this.setByShorthand = setByShorthand;
> @@ -273,7 +273,7 @@
> * the default value.
> * @param subpropId The subproperty id of the property being
> retrieved. * Is 0 when retriving a base property.
> - * @param propertylist The PropertyList object being built for
> this FO. + * @param propertyList The PropertyList object being
> built for this FO. * @param bTryInherit true if inherited properties
> should be examined. * @param bTryDefault true if the default value
> should be returned. */
> @@ -319,7 +319,7 @@
> * property.
> * @param p A property value for a compound property type such
> as * SpaceProperty.
> - * @param subprop The Constants ID of the component whose value
> is to be + * @param subpropId the id of the component whose value
> is to be * returned.
> * NOTE: this is only to ease porting when calls are made to
> * PropertyList.get() using a component name of a compound
> property, @@ -503,8 +503,8 @@
> * initializers "thin", "medium", or "thick". The
> FOPropertyMapping * file specifies a length value equivalent for
> these keywords, * such as "0.5pt" for "thin".
> - * @param value The string value of property attribute.
> - * @return A String containging a parseable equivalent or null
> if + * @param keyword the string value of property attribute. +
> * @return a String containing a parseable equivalent or null if *
> the passed value isn't a keyword initializer for this Property. */
> protected String checkValueKeywords(String keyword) {
> @@ -514,6 +514,7 @@
> return value;
> }
> }
> + // TODO: should return null here?
> return keyword;
> }
>
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProp
>erty.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/SpaceProperty.java?rev=279656&r1=279655&r2=279656
>&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProp
>erty.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/SpaceProp
>erty.java Thu Sep 8 15:06:48 2005 @@ -38,7 +38,7 @@
> public static class Maker extends CompoundPropertyMaker {
>
> /**
> - * @param name name of the property whose Maker is to be
> created + * @param propId the id of the property for which a
> Maker should be created */
> public Maker(int propId) {
> super(propId);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringPro
>perty.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/StringProperty.java?rev=279656&r1=279655&r2=27965
>6&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringPro
>perty.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringPro
>perty.java Thu Sep 8 15:06:48 2005 @@ -33,7 +33,7 @@
> public static class Maker extends PropertyMaker {
>
> /**
> - * @param propName name of property for which to create a
> Maker + * @param propId the id of the property for which a
> Maker should be created */
> public Maker(int propId) {
> super(propId);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColL
>ength.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fo/properties/TableColLength.java?rev=279656&r1=279655&r2=27965
>6&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColL
>ength.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TableColL
>ength.java Thu Sep 8 15:06:48 2005 @@ -78,10 +78,7 @@
> }
>
> /**
> - * Return the value of this Numeric.
> - * @param context Evaluation context
> - * @return the value
> - * @see Numeric#getNumericValue(Object)
> + * @see
> org.apache.fop.datatypes.Numeric#getNumericValue(PercentBaseContext)
> */
> public double getNumericValue(PercentBaseContext context) {
> return getNumericValue();
> @@ -96,9 +93,7 @@
> }
>
> /**
> - * Returns the length in 1/1000ths of a point (millipoints)
> - * @param Evaluation context
> - * @return the length in millipoints
> + * @see
> org.apache.fop.datatypes.Numeric#getValue(PercentBaseContext) */
> public int getValue(PercentBaseContext context) {
> return getValue();
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java
> URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/fonts/FontSetup.java?rev=279656&r1=279655&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java
> (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontSetup.java
> Thu Sep 8 15:06:48 2005 @@ -164,10 +164,9 @@
> }
>
> /**
> - * Add fonts from configuration file starting with
> - * internalnames F<num>
> + * Add fonts from configuration file starting with internal name
> F<num>. * @param fontInfo the font info object to set up
> - * @param fontInfos ???
> + * @param fontInfoList
> * @param num starting index for internal font numbering
> */
> public static void addConfiguredFonts(FontInfo fontInfo, List
> fontInfoList, int num) {
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStacking
>LayoutManager.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/layoutmgr/BlockStackingLayoutManager.java?rev=279656&r1=279655&
>r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStacking
>LayoutManager.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockStacking
>LayoutManager.java Thu Sep 8 15:06:48 2005 @@ -82,7 +82,7 @@
> private int contentAreaIPD = 0;
>
> /**
> - * @param the fo this LM deals with
> + * @param node the fo this LM deals with
> */
> public BlockStackingLayoutManager(FObj node) {
> super(node);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthElement.
>java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/layoutmgr/KnuthElement.java?rev=279656&r1=279655&r2=279656&view
>=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthElement.
>java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthElement.
>java Thu Sep 8 15:06:48 2005 @@ -38,7 +38,6 @@
> * Create a new KnuthElement.
> * This class being abstract, this can be called only by
> subclasses. *
> - * @param t the type of this element (one of the KNUTH_*
> constants) * @param w the width of this element
> * @param pos the Position stored in this element
> * @param bAux is this an auxiliary element?
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Abstra
>ctGraphicsLayoutManager.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java?rev=279656&
>r1=279655&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Abstra
>ctGraphicsLayoutManager.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Abstra
>ctGraphicsLayoutManager.java Thu Sep 8 15:06:48 2005 @@ -44,7 +44,6
> @@
> /**
> * Constructor
> * @param node the formatting object that creates this area
> - * @param parent the parent layout manager
> */
> public AbstractGraphicsLayoutManager(AbstractGraphics node) {
> super(node);
> @@ -242,7 +241,7 @@
> * to take the border/padding into account as well.
> * @param area the inline area to be updated
> * @param context the layout context used for adding the area
> - * @see LeafNodeLayoutManager#offsetArea(InlineArae,
> LayoutContext) + * @see
> LeafNodeLayoutManager#offsetArea(InlineArea, LayoutContext) */
> protected void offsetArea(InlineArea area, LayoutContext
> context) { int bpd = area.getBPD()
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Conten
>tLayoutManager.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/layoutmgr/inline/ContentLayoutManager.java?rev=279656&r1=279655
>&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Conten
>tLayoutManager.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Conten
>tLayoutManager.java Thu Sep 8 15:06:48 2005 @@ -74,7 +74,7 @@
> this.parentLM = pslm;
> holder = new LineArea();
>
> - setUserAgent(foTitle.getUserAgent());
> + // setUserAgent(foTitle.getUserAgent());
>
> // use special layout manager to add the inline areas
> // to the Title.
> @@ -186,18 +186,20 @@
> *
> * @param ua the user agent
> */
> - public void setUserAgent(FOUserAgent ua) {
> - userAgent = ua;
> - }
> +// public void setUserAgent(FOUserAgent ua) {
> +// userAgent = ua;
> +// }
>
> /**
> * @see org.apache.fop.layoutmgr.LayoutManager#getUserAgent()
> */
> - public FOUserAgent getUserAgent() {
> - return userAgent;
> - }
> +// public FOUserAgent getUserAgent() {
> +// return userAgent;
> +// }
>
> - /** @see org.apache.fop.layoutmgr.LayoutManager */
> + /**
> + * @see
> org.apache.fop.layoutmgr.LayoutManager#setParent(LayoutManager) +
> */
> public void setParent(LayoutManager lm) {
> parentLM = lm;
> }
> @@ -206,30 +208,36 @@
> return this.parentLM;
> }
>
> - /** @see org.apache.fop.layoutmgr.LayoutManager */
> + /**
> + * @see org.apache.fop.layoutmgr.LayoutManager#isFinished()
> + */
> public boolean isFinished() {
> return false;
> }
>
> - /** @see org.apache.fop.layoutmgr.LayoutManager */
> + /**
> + * @see
> org.apache.fop.layoutmgr.LayoutManager#setFinished(boolean) + */
> public void setFinished(boolean isFinished) {
> //to be done
> }
>
> - /** @see org.apache.fop.layoutmgr.LayoutManager */
> + /**
> + * @see
> org.apache.fop.layoutmgr.LayoutManager#resetPosition(Position) +
> */
> public void resetPosition(Position position) {
> //to be done
> }
>
> /**
> - * @see
> org.apache.fop.layoutmgr.LayoutManager#createNextChildLMs + *
> @see org.apache.fop.layoutmgr.LayoutManager#createNextChildLMs(int)
> */
> public boolean createNextChildLMs(int pos) {
> return false;
> }
>
> /**
> - * @see org.apache.fop.layoutmgr.LayoutManager#getChildLMs
> + * @see org.apache.fop.layoutmgr.LayoutManager#getChildLMs()
> */
> public List getChildLMs() {
> List childLMs = new ArrayList(1);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Inline
>LayoutManager.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/layoutmgr/inline/InlineLayoutManager.java?rev=279656&r1=279655&
>r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Inline
>LayoutManager.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/Inline
>LayoutManager.java Thu Sep 8 15:06:48 2005 @@ -117,7 +117,7 @@
> return inlineProps.spaceEnd;
> }
>
> - /** @see
> org.apache.fop.layoutmgr.inline.InlineStackingLayoutManager#createAre
>a() */ + /** @see
> org.apache.fop.layoutmgr.inline.InlineLayoutManager#createArea(boolea
>n) */ protected InlineArea createArea(boolean bInlineParent) {
> InlineArea area;
> if (bInlineParent) {
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLa
>youtManager.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/layoutmgr/inline/TextLayoutManager.java?rev=279656&r1=279655&r2
>=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLa
>youtManager.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLa
>youtManager.java Thu Sep 8 15:06:48 2005 @@ -380,8 +380,9 @@
> * @param str the string for the TextArea
> * @param width the MinOptMax width of the content
> * @param adjust the total ipd adjustment with respect to the
> optimal width - * @param base the baseline position
> - * @return the new word area
> + * @param context the layout context
> + * @param spaceDiff unused
> + * @return the new text area
> */
> protected TextArea createTextArea(String str, MinOptMax width,
> int adjust, LayoutContext context, int spaceDiff) {
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBloc
>kLayoutManager.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/layoutmgr/list/ListBlockLayoutManager.java?rev=279656&r1=279655
>&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBloc
>kLayoutManager.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListBloc
>kLayoutManager.java Thu Sep 8 15:06:48 2005 @@ -73,7 +73,6 @@
> /**
> * Create a new list block layout manager.
> * @param node list-block to create the layout manager for
> - * @param parent the parent layout manager
> */
> public ListBlockLayoutManager(ListBlock node) {
> super(node);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/Collaps
>ingBorderModel.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/layoutmgr/table/CollapsingBorderModel.java?rev=279656&r1=279655
>&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/Collaps
>ingBorderModel.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/Collaps
>ingBorderModel.java Thu Sep 8 15:06:48 2005 @@ -48,12 +48,13 @@
> //public static final int FIRST_ROW_IN_GROUP = 4;
> /** Indicates that the cell is/end in the last row of a
> body/table-header/table-footer */ //public static final int
> LAST_ROW_IN_GROUP = 8;
> -
> +
> + // TODO: this is not MT safe. Must be removed.
> private static CollapsingBorderModel collapse = null;
> private static CollapsingBorderModel collapseWithPrecedence =
> null;
>
> /**
> - * @param cellLM the cell
> + * @param borderCollapse border collapse control
> * @return the border model for the cell
> */
> public static CollapsingBorderModel getBorderModelFor(int
> borderCollapse) {
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCo
>ntentLayoutManager.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/layoutmgr/table/TableContentLayoutManager.java?rev=279656&r1=27
>9655&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCo
>ntentLayoutManager.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCo
>ntentLayoutManager.java Thu Sep 8 15:06:48 2005 @@ -1135,7 +1135,7 @@
> // --------- Property Resolution related functions --------- //
>
> /**
> - * @see
> org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, fobj)
> + * @see
> org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, FObj)
> */
> public int getBaseLength(int lengthBase, FObj fobj) {
> return tableLM.getBaseLength(lengthBase, fobj);
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManage
>r.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/pdf/PDFEncryptionManager.java?rev=279656&r1=279655&r2=279656&vi
>ew=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManage
>r.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFEncryptionManage
>r.java Thu Sep 8 15:06:48 2005 @@ -76,7 +76,6 @@
> * the necessary cryptographic support is available.
> * @param params the PDF encryption params or null to disable
> encryption * @param pdf the PDF document to setup encryption for
> - * @param log the logger to send warnings to
> */
> public static void setupPDFEncryption(PDFEncryptionParams
> params, PDFDocument pdf) {
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRen
>derer.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/render/java2d/Java2DRenderer.java?rev=279656&r1=279655&r2=27965
>6&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRen
>derer.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRen
>derer.java Thu Sep 8 15:06:48 2005 @@ -204,22 +204,31 @@
> }
> }
>
> - /** @return The 0-based current page number */
> + /**
> + * @return The 0-based current page number
> + */
> public int getCurrentPageNumber() {
> return currentPageNumber;
> }
>
> - /** @param The 0-based current page number */
> + /**
> + * @param c the 0-based current page number
> + */
> public void setCurrentPageNumber(int c) {
> this.currentPageNumber = c;
> }
>
> - /** @return The 0-based total number of rendered pages */
> + /**
> + * @return The 0-based total number of rendered pages
> + */
> public int getNumberOfPages() {
> return numberOfPages;
> }
>
> - /** clears the ViewportList, in case the document is reloaded */
> + /**
> + * Clears the ViewportList.
> + * Used if the document is reloaded.
> + */
> public void clearViewportList() {
> pageViewportList.clear();
> setCurrentPageNumber(0);
> @@ -238,7 +247,8 @@
> */
> public void renderPage(PageViewport pageViewport)
> throws IOException, FOPException {
> - pageViewportList.add(pageViewport.clone()); // FIXME clone
> + // TODO clone
> + pageViewportList.add(pageViewport.clone());
> currentPageNumber++;
> }
>
> @@ -547,7 +557,7 @@
> * Draw the background and borders. This draws the background
> and border * traits for an area given the position.
> *
> - * @param block the area to get the traits from
> + * @param area the area whose traits are used
> * @param startx the start x position
> * @param starty the start y position
> * @param width the width of the area
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java
> URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/svg/SVGUserAgent.java?rev=279656&r1=279655&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java
> (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/SVGUserAgent.java
> Thu Sep 8 15:06:48 2005 @@ -46,9 +46,8 @@
>
> /**
> * Creates a new SVGUserAgent.
> - * @param log an Commons logging instance
> - * @param pixelUnitToMM The pixel to millimeter conversion
> factor - * currently in effect
> + * @param pixelUnitToMM the pixel to millimeter conversion
> factor + * currently in effect
> * @param at the current transform
> */
> public SVGUserAgent(float pixelUnitToMM, AffineTransform at) {
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileComp
>are.java URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/tools/anttasks/FileCompare.java?rev=279656&r1=279655&r2=279656&
>view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileComp
>are.java (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileComp
>are.java Thu Sep 8 15:06:48 2005 @@ -80,14 +80,16 @@
>
> /**
> * Compares two files to see if they are equal
> - * @param true if files are same, false otherwise
> + * @param f1 first file to compare
> + * @param f2 second file to compare
> + * @return true if files are same, false otherwise
> */
> public static boolean compareFiles(File f1, File f2) throws
> IOException { return (compareFileSize(f1, f2) && compareBytes(f1,
> f2)); }
>
> /**
> - * Does a byte compare of two files
> + * Compare the contents of two files.
> * @param true if files are same byte-by-byte, false otherwise
> */
> private static boolean compareBytes(File file1, File file2)
> throws IOException {
>
> Modified:
> xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/MinOptMax.java
> URL:
> http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apac
>he/fop/traits/MinOptMax.java?rev=279656&r1=279655&r2=279656&view=diff
> =====================================================================
>========= ---
> xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/MinOptMax.java
> (original) +++
> xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/MinOptMax.java
> Thu Sep 8 15:06:48 2005 @@ -55,17 +55,16 @@
> * @param max the maximum value
> */
> public MinOptMax(int min, int opt, int max) {
> + // TODO: assert min<=opt<=max
> this.min = min;
> this.opt = opt;
> this.max = max;
> }
>
> /**
> - * New min/opt/max with the three values.
> + * Copy constructor.
> *
> - * @param min the minimum value
> - * @param opt the optimum value
> - * @param max the maximum value
> + * @param op the MinOptMax object to copy
> */
> public MinOptMax(MinOptMax op) {
> this.min = op.min;
> @@ -73,6 +72,7 @@
> this.max = op.max;
> }
>
> + // TODO: remove this.
> /**
> * @see java.lang.Object#clone()
> */
> @@ -114,6 +114,7 @@
> * @return MinOptMax new instance
> */
> public static MinOptMax multiply(MinOptMax op1, double mult) {
> + // TODO: assert mult>0
> return new MinOptMax((int)(op1.min * mult),
> (int)(op1.opt * mult), (int)(op1.max *
> mult)); }
> @@ -129,18 +130,21 @@
> }
>
> /**
> - * Adds another MinOptMax instance to this one.
> - * @param op the other instance
> + * Adds min, opt and max to their counterpart components.
> + * @param min the value to add to the minimum value
> + * @param opt the value to add to the optimum value
> + * @param max the value to add to the maximum value
> */
> public void add(int min, int opt, int max) {
> this.min += min;
> this.opt += opt;
> this.max += max;
> + // TODO: assert min<=opt<=max
> }
>
> /**
> - * Adds another MinOptMax instance to this one.
> - * @param op the other instance
> + * Adds a length to all components.
> + * @param len the length to add
> */
> public void add(int len) {
> this.min += len;
> @@ -150,7 +154,7 @@
>
>
> /**
> - * Subtracts from this instance using another.
> + * Subtracts another MinOptMax instance from this one.
> * @param op the other instance
> */
> public void subtract(MinOptMax op) {
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail:
> fop-commits-unsubscribe@xmlgraphics.apache.org For additional
> commands, e-mail: fop-commits-help@xmlgraphics.apache.org