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 vh...@apache.org on 2010/08/17 20:57:15 UTC
svn commit: r986451 [4/13] - in
/xmlgraphics/fop/branches/Temp_ComplexScripts: ./
examples/plan/src/org/apache/fop/plan/
src/codegen/java/org/apache/fop/tools/ src/codegen/unicode/data/
src/codegen/unicode/java/org/apache/fop/hyphenation/ src/codegen/u...
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/NumericOp.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/NumericOp.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/NumericOp.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/NumericOp.java Tue Aug 17 18:57:04 2010
@@ -30,7 +30,11 @@ import org.apache.fop.datatypes.Numeric;
* The evaluation of the operation can then occur when getNumericValue() is
* called.
*/
-public class NumericOp {
+public final class NumericOp {
+
+ private NumericOp() {
+ }
+
/**
* Add the two operands and return a new Numeric representing the result.
* @param op1 The first operand.
@@ -39,7 +43,8 @@ public class NumericOp {
* @throws PropertyException If the dimension of the operand is different
* from the dimension of this Numeric.
*/
- public static Numeric addition(Numeric op1, Numeric op2) throws PropertyException {
+ public static Numeric addition(Numeric op1, Numeric op2)
+ throws PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return addition2(op1, op2, null);
} else {
@@ -47,11 +52,23 @@ public class NumericOp {
}
}
- public static Numeric addition2(Numeric op1, Numeric op2, PercentBaseContext context) throws PropertyException {
+ /**
+ * Add the two operands with a percentage context
+ * and return a new Numeric representing the result.
+ * @param op1 The first operand.
+ * @param op2 The second operand.
+ * @param context a percent base context
+ * @return A Numeric representing the result.
+ * @throws PropertyException If the dimension of the operand is different
+ * from the dimension of this Numeric.
+ */
+ public static Numeric addition2(Numeric op1, Numeric op2, PercentBaseContext context)
+ throws PropertyException {
if (op1.getDimension() != op2.getDimension()) {
throw new PropertyException("Can't subtract Numerics of different dimensions");
}
- return numeric(op1.getNumericValue(context) + op2.getNumericValue(context), op1.getDimension());
+ return numeric(op1.getNumericValue(context)
+ + op2.getNumericValue(context), op1.getDimension());
}
/**
@@ -63,7 +80,8 @@ public class NumericOp {
* @throws PropertyException If the dimension of the operand is different
* from the dimension of this Numeric.
*/
- public static Numeric subtraction(Numeric op1, Numeric op2) throws PropertyException {
+ public static Numeric subtraction(Numeric op1, Numeric op2)
+ throws PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return subtraction2(op1, op2, null);
} else {
@@ -71,11 +89,23 @@ public class NumericOp {
}
}
- public static Numeric subtraction2(Numeric op1, Numeric op2, PercentBaseContext context) throws PropertyException {
+ /**
+ * Subtract the two operands with a percentage context
+ * and return a new Numeric representing the result.
+ * @param op1 The first operand.
+ * @param op2 The second operand.
+ * @param context a percent base context
+ * @return A Numeric representing the result.
+ * @throws PropertyException If the dimension of the operand is different
+ * from the dimension of this Numeric.
+ */
+ public static Numeric subtraction2(Numeric op1, Numeric op2, PercentBaseContext context)
+ throws PropertyException {
if (op1.getDimension() != op2.getDimension()) {
throw new PropertyException("Can't subtract Numerics of different dimensions");
}
- return numeric(op1.getNumericValue(context) - op2.getNumericValue(context), op1.getDimension());
+ return numeric(op1.getNumericValue(context)
+ - op2.getNumericValue(context), op1.getDimension());
}
/**
@@ -87,7 +117,8 @@ public class NumericOp {
* @throws PropertyException If the dimension of the operand is different
* from the dimension of this Numeric.
*/
- public static Numeric multiply(Numeric op1, Numeric op2) throws PropertyException {
+ public static Numeric multiply(Numeric op1, Numeric op2)
+ throws PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return multiply2(op1, op2, null);
} else {
@@ -95,7 +126,18 @@ public class NumericOp {
}
}
- public static Numeric multiply2(Numeric op1, Numeric op2, PercentBaseContext context) throws PropertyException {
+ /**
+ * Multiply the two operands with a percentage context
+ * and return a new Numeric representing the result.
+ * @param op1 The first operand.
+ * @param op2 The second operand.
+ * @param context a percent base context
+ * @return A Numeric representing the result.
+ * @throws PropertyException If the dimension of the operand is different
+ * from the dimension of this Numeric.
+ */
+ public static Numeric multiply2(Numeric op1, Numeric op2, PercentBaseContext context)
+ throws PropertyException {
return numeric(op1.getNumericValue(context) * op2.getNumericValue(context),
op1.getDimension() + op2.getDimension());
}
@@ -118,7 +160,18 @@ public class NumericOp {
}
}
- public static Numeric divide2(Numeric op1, Numeric op2, PercentBaseContext context) throws PropertyException {
+ /**
+ * Divide the two operands with a percentage context
+ * and return a new Numeric representing the result.
+ * @param op1 The first operand.
+ * @param op2 The second operand.
+ * @param context a percent base context
+ * @return A Numeric representing the result.
+ * @throws PropertyException If the dimension of the operand is different
+ * from the dimension of this Numeric.
+ */
+ public static Numeric divide2(Numeric op1, Numeric op2, PercentBaseContext context)
+ throws PropertyException {
return numeric(op1.getNumericValue(context) / op2.getNumericValue(context),
op1.getDimension() - op2.getDimension());
}
@@ -128,8 +181,10 @@ public class NumericOp {
* @param op1 The first operand.
* @param op2 The second operand.
* @return A new Numeric object representing the absolute value.
+ * @throws PropertyException if a property exception occurs
*/
- public static Numeric modulo(Numeric op1, Numeric op2) throws PropertyException {
+ public static Numeric modulo(Numeric op1, Numeric op2)
+ throws PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return modulo2(op1, op2, null);
} else {
@@ -137,16 +192,29 @@ public class NumericOp {
}
}
- public static Numeric modulo2(Numeric op1, Numeric op2, PercentBaseContext context) throws PropertyException {
- return numeric(op1.getNumericValue(context) % op2.getNumericValue(context), op1.getDimension());
+ /**
+ * Return the remainder of a division of the two operand Numeric.
+ * @param op1 The first operand.
+ * @param op2 The second operand.
+ * @param context a percent base context
+ * @return A Numeric representing the result.
+ * @throws PropertyException If the dimension of the operand is different
+ * from the dimension of this Numeric.
+ */
+ public static Numeric modulo2(Numeric op1, Numeric op2, PercentBaseContext context)
+ throws PropertyException {
+ return numeric(op1.getNumericValue(context)
+ % op2.getNumericValue(context), op1.getDimension());
}
/**
* Return the absolute value of a Numeric.
* @param op the operand.
* @return a new Numeric object representing the absolute value of the operand.
+ * @throws PropertyException if a property exception occurs
*/
- public static Numeric abs(Numeric op) throws PropertyException {
+ public static Numeric abs(Numeric op)
+ throws PropertyException {
if (op.isAbsolute()) {
return abs2(op, null);
} else {
@@ -154,7 +222,16 @@ public class NumericOp {
}
}
- public static Numeric abs2(Numeric op, PercentBaseContext context) throws PropertyException {
+ /**
+ * Return the absolute value of a Numeric.
+ * @param op the operand.
+ * @param context a percent base context
+ * @return A Numeric representing the result.
+ * @throws PropertyException If the dimension of the operand is different
+ * from the dimension of this Numeric.
+ */
+ public static Numeric abs2(Numeric op, PercentBaseContext context)
+ throws PropertyException {
return numeric(Math.abs(op.getNumericValue(context)), op.getDimension());
}
@@ -162,8 +239,10 @@ public class NumericOp {
* Return the negation of a Numeric.
* @param op the operand.
* @return a new Numeric object representing the negation of the operand.
+ * @throws PropertyException if a property exception occurs
*/
- public static Numeric negate(Numeric op) throws PropertyException {
+ public static Numeric negate(Numeric op)
+ throws PropertyException {
if (op.isAbsolute()) {
return negate2(op, null);
} else {
@@ -171,8 +250,18 @@ public class NumericOp {
}
}
- public static Numeric negate2(Numeric op, PercentBaseContext context) throws PropertyException {
- return numeric(- op.getNumericValue(context), op.getDimension());
+
+ /**
+ * Return the negation of a Numeric.
+ * @param op the operand.
+ * @param context a percent base context
+ * @return A Numeric representing the result.
+ * @throws PropertyException If the dimension of the operand is different
+ * from the dimension of this Numeric.
+ */
+ public static Numeric negate2(Numeric op, PercentBaseContext context)
+ throws PropertyException {
+ return numeric(-op.getNumericValue(context), op.getDimension());
}
/**
@@ -182,7 +271,8 @@ public class NumericOp {
* @return a Numeric which is the maximum of the two operands.
* @throws PropertyException if the dimensions or value types of the operands are different.
*/
- public static Numeric max(Numeric op1, Numeric op2) throws PropertyException {
+ public static Numeric max(Numeric op1, Numeric op2)
+ throws PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return max2(op1, op2, null);
} else {
@@ -190,7 +280,17 @@ public class NumericOp {
}
}
- public static Numeric max2(Numeric op1, Numeric op2, PercentBaseContext context) throws PropertyException {
+ /**
+ * Return the larger of the two Numerics.
+ * @param op1 The first operand.
+ * @param op2 The second operand.
+ * @param context a percent base context
+ * @return A Numeric representing the result.
+ * @throws PropertyException If the dimension of the operand is different
+ * from the dimension of this Numeric.
+ */
+ public static Numeric max2(Numeric op1, Numeric op2, PercentBaseContext context)
+ throws PropertyException {
if (op1.getDimension() != op2.getDimension()) {
throw new PropertyException("Arguments to max() must have same dimensions");
}
@@ -204,7 +304,8 @@ public class NumericOp {
* @return a Numeric which is the minimum of the two operands.
* @throws PropertyException if the dimensions or value types of the operands are different.
*/
- public static Numeric min(Numeric op1, Numeric op2) throws PropertyException {
+ public static Numeric min(Numeric op1, Numeric op2)
+ throws PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return min2(op1, op2, null);
} else {
@@ -212,7 +313,17 @@ public class NumericOp {
}
}
- public static Numeric min2(Numeric op1, Numeric op2, PercentBaseContext context) throws PropertyException {
+ /**
+ * Return the smaller of the two Numerics.
+ * @param op1 The first operand.
+ * @param op2 The second operand.
+ * @param context a percent base context
+ * @return A Numeric representing the result.
+ * @throws PropertyException If the dimension of the operand is different
+ * from the dimension of this Numeric.
+ */
+ public static Numeric min2(Numeric op1, Numeric op2, PercentBaseContext context)
+ throws PropertyException {
if (op1.getDimension() != op2.getDimension()) {
throw new PropertyException("Arguments to min() must have same dimensions");
}
@@ -221,8 +332,8 @@ public class NumericOp {
/**
* Create a new absolute numeric with the specified value and dimension.
- * @param value
- * @param dimension
+ * @param value of numeric
+ * @param dimension of numeric
* @return a new absolute numeric.
*/
private static Numeric numeric(double value, int dimension) {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/PropertyInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/PropertyInfo.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/PropertyInfo.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/PropertyInfo.java Tue Aug 17 18:57:04 2010
@@ -58,6 +58,7 @@ public class PropertyInfo {
* a percent specification.
* Propagates to the Maker.
* @return The PercentBase object or null if percentLengthOK()=false.
+ * @throws PropertyException if a property exception occurs
*/
public PercentBase getPercentBase() throws PropertyException {
PercentBase pcbase = getFunctionPercentBase();
@@ -66,6 +67,7 @@ public class PropertyInfo {
/**
* @return the current font-size value as base units (milli-points).
+ * @throws PropertyException if a property exception occurs
*/
public Length currentFontSize() throws PropertyException {
return plist.get(Constants.PR_FONT_SIZE).getLength();
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java Tue Aug 17 18:57:04 2010
@@ -83,7 +83,7 @@ class PropertyTokenizer {
boolean currentMaybeOperator = recognizeOperator;
boolean bSawDecimal;
recognizeOperator = true;
- for (; ;) {
+ while ( true ) {
if (exprIndex >= exprLength) {
currentToken = TOK_EOF;
return;
@@ -273,8 +273,11 @@ class PropertyTokenizer {
}
private void scanRestOfName() {
- while (++exprIndex < exprLength
- && isNameChar(expr.charAt(exprIndex))) { }
+ while ( ++exprIndex < exprLength ) {
+ if ( !isNameChar ( expr.charAt ( exprIndex ) ) ) {
+ break;
+ }
+ }
}
/**
@@ -320,8 +323,8 @@ class PropertyTokenizer {
}
- private static final String NAME_START_CHARS =
- "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ private static final String NAME_START_CHARS
+ = "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
private static final String NAME_CHARS = ".-0123456789";
private static final String DIGITS = "0123456789";
private static final String HEX_CHARS = DIGITS + "abcdefABCDEF";
@@ -331,7 +334,7 @@ class PropertyTokenizer {
* decimal digit (0-9).
* @param c The character to check
*/
- private static final boolean isDigit(char c) {
+ private static boolean isDigit(char c) {
return DIGITS.indexOf(c) >= 0;
}
@@ -340,7 +343,7 @@ class PropertyTokenizer {
* hexadecimal digit (0-9, A-F, a-f).
* @param c The character to check
*/
- private static final boolean isHexDigit(char c) {
+ private static boolean isHexDigit(char c) {
return HEX_CHARS.indexOf(c) >= 0;
}
@@ -349,15 +352,16 @@ class PropertyTokenizer {
* as defined by XSL (space, newline, CR, tab).
* @param c The character to check
*/
- private static final boolean isSpace(char c) {
+ private static boolean isSpace(char c) {
switch (c) {
case ' ':
case '\r':
case '\n':
case '\t':
return true;
+ default:
+ return false;
}
- return false;
}
/**
@@ -365,7 +369,7 @@ class PropertyTokenizer {
* start character, ie. can start a NAME as defined by XSL.
* @param c The character to check
*/
- private static final boolean isNameStartChar(char c) {
+ private static boolean isNameStartChar(char c) {
return NAME_START_CHARS.indexOf(c) >= 0 || c >= 0x80;
}
@@ -374,7 +378,7 @@ class PropertyTokenizer {
* character, ie. can occur in a NAME as defined by XSL.
* @param c The character to check
*/
- private static final boolean isNameChar(char c) {
+ private static boolean isNameChar(char c) {
return NAME_START_CHARS.indexOf(c) >= 0 || NAME_CHARS.indexOf(c) >= 0
|| c >= 0x80;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java Tue Aug 17 18:57:04 2010
@@ -33,14 +33,23 @@ import org.apache.fop.fo.properties.Tabl
* or getValue() is called.
*/
public class RelativeNumericProperty extends Property implements Length {
+ /** ADDITION */
public static final int ADDITION = 1;
+ /** SUBTRACTION */
public static final int SUBTRACTION = 2;
+ /** MULTIPLY */
public static final int MULTIPLY = 3;
+ /** DIVIDE */
public static final int DIVIDE = 4;
+ /** MODULO */
public static final int MODULO = 5;
+ /** NEGATE */
public static final int NEGATE = 6;
+ /** ABS */
public static final int ABS = 7;
+ /** MAX */
public static final int MAX = 8;
+ /** MIN */
public static final int MIN = 9;
// Used in the toString() method, indexed by operation id.
@@ -145,6 +154,7 @@ public class RelativeNumericProperty ext
/**
* Return the dimension of the expression
+ * @return numeric value as dimension
*/
public int getDimension() {
return dimension;
@@ -153,6 +163,7 @@ public class RelativeNumericProperty ext
/**
* Return false since an expression is only created when there is relative
* numerics involved.
+ * @return true if expression is absolute
*/
public boolean isAbsolute() {
return false;
@@ -160,6 +171,7 @@ public class RelativeNumericProperty ext
/**
* Cast this numeric as a Length.
+ * @return numeric value as length
*/
public Length getLength() {
if (dimension == 1) {
@@ -169,6 +181,7 @@ public class RelativeNumericProperty ext
return null;
}
+ /** @return numeric value */
public Numeric getNumeric() {
return this;
}
@@ -272,7 +285,8 @@ public class RelativeNumericProperty ext
return "min(" + op1 + ", " + op2 + ")";
case ABS:
return "abs(" + op1 + ")";
+ default:
+ return "unknown operation " + operation;
}
- return "unknown operation " + operation;
}
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java Tue Aug 17 18:57:04 2010
@@ -37,17 +37,18 @@ public class ExtensionElementMapping ext
/** The FOP extension namespace URI */
public static final String URI = "http://xmlgraphics.apache.org/fop/extensions";
- private static final Set propertyAttributes = new java.util.HashSet();
+ private static final Set PROPERTY_ATTRIBUTES
+ = new java.util.HashSet();
static {
//These are FOP's standard extension properties (fox:*)
- propertyAttributes.add("block-progression-unit");
- propertyAttributes.add("widow-content-limit");
- propertyAttributes.add("orphan-content-limit");
- propertyAttributes.add("internal-destination");
- propertyAttributes.add("disable-column-balancing");
+ PROPERTY_ATTRIBUTES.add("block-progression-unit");
+ PROPERTY_ATTRIBUTES.add("widow-content-limit");
+ PROPERTY_ATTRIBUTES.add("orphan-content-limit");
+ PROPERTY_ATTRIBUTES.add("internal-destination");
+ PROPERTY_ATTRIBUTES.add("disable-column-balancing");
//These are FOP's extension properties for accessibility
- propertyAttributes.add("alt-text");
+ PROPERTY_ATTRIBUTES.add("alt-text");
}
/**
@@ -92,7 +93,7 @@ public class ExtensionElementMapping ext
if (!URI.equals(attributeName.getNamespaceURI())) {
throw new IllegalArgumentException("The namespace URIs don't match");
}
- return propertyAttributes.contains(attributeName.getLocalName());
+ return PROPERTY_ATTRIBUTES.contains(attributeName.getLocalName());
}
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExtensionObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExtensionObj.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExtensionObj.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExtensionObj.java Tue Aug 17 18:57:04 2010
@@ -47,13 +47,15 @@ public abstract class ExtensionObj exten
*/
public void processNode(String elementName, Locator locator,
Attributes attlist, PropertyList pList)
- throws FOPException
- {
- // Empty
+ throws FOPException {
}
/**
* Create a default property list for this element.
+ * @param parent the parent property list
+ * @param foEventHandler an event handler
+ * @return property list
+ * @throws FOPException in case of exception
*/
protected PropertyList createPropertyList(PropertyList parent,
FOEventHandler foEventHandler) throws FOPException {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExternalDocument.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExternalDocument.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExternalDocument.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/ExternalDocument.java Tue Aug 17 18:57:04 2010
@@ -82,13 +82,18 @@ public class ExternalDocument extends Ab
}
}
+ /**
+ * @throws FOPException in case of processing exception
+ * @see org.apache.fop.fo.FONode#startOfNode()
+ */
protected void startOfNode() throws FOPException {
super.startOfNode();
getFOEventHandler().startExternalDocument(this);
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * @throws FOPException in case of processing exception
+ * @see org.apache.fop.fo.FONode#endOfNode()
*/
protected void endOfNode() throws FOPException {
getFOEventHandler().endExternalDocument(this);
@@ -96,8 +101,11 @@ public class ExternalDocument extends Ab
}
/**
+ * @param loc a locator
+ * @param nsURI a namespace uri or null
+ * @param localName a local name
+ * @throws ValidationException if invalid child
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
- XSL/FOP: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
@@ -162,17 +170,26 @@ public class ExternalDocument extends Ab
return textAlign;
}
- /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+ /**
+ * @return namespace uri
+ * @see org.apache.fop.fo.FONode#getNamespaceURI()
+ */
public String getNamespaceURI() {
return ExtensionElementMapping.URI;
}
- /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */
+ /**
+ * @return namespace prefix
+ * @see org.apache.fop.fo.FONode#getNormalNamespacePrefix()
+ */
public String getNormalNamespacePrefix() {
return "fox";
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /**
+ * @return local name
+ * @see org.apache.fop.fo.FONode#getLocalName()
+ */
public String getLocalName() {
return "external-document";
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java Tue Aug 17 18:57:04 2010
@@ -53,7 +53,7 @@ public class BatikExtensionElementMappin
* Batik classes that apparently need it (error messages, perhaps)
* @return an XML parser classname
*/
- private final String getAParserClassName() {
+ private String getAParserClassName() {
try {
//TODO Remove when Batik uses JAXP instead of SAX directly.
SAXParserFactory factory = SAXParserFactory.newInstance();
@@ -63,6 +63,7 @@ public class BatikExtensionElementMappin
}
}
+ /** initialize mapping */
protected void initialize() {
if (foObjs == null && batikAvail) {
// this sets the parser that will be used
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java Tue Aug 17 18:57:04 2010
@@ -105,7 +105,7 @@ public class SVGDOMContentHandlerFactory
Class clazz = Class.forName(
"org.apache.batik.dom.svg12.SVG12DOMImplementation");
return (DOMImplementation)clazz.getMethod(
- "getDOMImplementation", null).invoke(null, null);
+ "getDOMImplementation", (Class[])null).invoke(null, (Object[])null);
} catch (Exception e) {
return SVGDOMImplementation.getDOMImplementation();
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java Tue Aug 17 18:57:04 2010
@@ -109,7 +109,9 @@ public abstract class AbstractPageNumber
}
/** {@inheritDoc} */
- public void processNode(String elementName, Locator locator, Attributes attlist, PropertyList pList) throws FOPException {
+ public void processNode
+ (String elementName, Locator locator, Attributes attlist, PropertyList pList)
+ throws FOPException {
super.processNode(elementName, locator, attlist, pList);
if (!inMarker() && (refId == null || "".equals(refId))) {
missingPropertyError("ref-id");
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Block.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Block.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Block.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Block.java Tue Aug 17 18:57:04 2010
@@ -330,7 +330,8 @@ public class Block extends FObjMixed imp
/**
* @return the "fox:disable-column-balancing" property, one of
- * {@link Constants#EN_TRUE}, {@link Constants#EN_FALSE}
+ * {@link org.apache.fop.fo.Constants#EN_TRUE},
+ * {@link org.apache.fop.fo.Constants#EN_FALSE}
*/
public int getDisableColumnBalancing() {
return disableColumnBalancing;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/BlockContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/BlockContainer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/BlockContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/BlockContainer.java Tue Aug 17 18:57:04 2010
@@ -219,7 +219,8 @@ public class BlockContainer extends FObj
/**
* @return the "fox:disable-column-balancing" property, one of
- * {@link Constants#EN_TRUE}, {@link Constants#EN_FALSE}
+ * {@link org.apache.fop.fo.Constants#EN_TRUE},
+ * {@link org.apache.fop.fo.Constants#EN_FALSE}
*/
public int getDisableColumnBalancing() {
return disableColumnBalancing;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Float.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Float.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Float.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Float.java Tue Aug 17 18:57:04 2010
@@ -38,7 +38,7 @@ public class Float extends FObj {
// private int clear;
// End of property values
- static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven = false;
/**
* Base constructor
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Footnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Footnote.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Footnote.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Footnote.java Tue Aug 17 18:57:04 2010
@@ -76,9 +76,9 @@ public class Footnote extends FObj {
/**
* {@inheritDoc}
* <br>XSL Content Model: (inline,footnote-body)
- * @todo implement additional constraint: A fo:footnote is not permitted
+ * @asf.todo implement additional constraint: A fo:footnote is not permitted
* to have a fo:float, fo:footnote, or fo:marker as a descendant.
- * @todo implement additional constraint: A fo:footnote is not
+ * @asf.todo implement additional constraint: A fo:footnote is not
* permitted to have as a descendant a fo:block-container that
* generates an absolutely positioned area.
*/
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Inline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Inline.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Inline.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Inline.java Tue Aug 17 18:57:04 2010
@@ -120,7 +120,8 @@ public class Inline extends InlineLevel
} else if (!isBlockOrInlineItem(nsURI, localName)) {
invalidChildError(loc, nsURI, localName);
} else if (!canHaveBlockLevelChildren && isBlockItem(nsURI, localName)) {
- invalidChildError(loc, getParent().getName(), nsURI, getName(), "rule.inlineContent");
+ invalidChildError(loc, getParent().getName(), nsURI, getName(),
+ "rule.inlineContent");
} else {
blockOrInlineItemFound = true;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Leader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Leader.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Leader.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Leader.java Tue Aug 17 18:57:04 2010
@@ -30,7 +30,7 @@ import org.apache.fop.fo.properties.Leng
* <code>fo:leader</code></a> object.
* The main property of <code>fo:leader</code> is leader-pattern.
* The following patterns are treated: rule, space, dots and use-content.
- * @todo implement validateChildNode()
+ * @asf.todo implement validateChildNode()
*/
public class Leader extends InlineLevel {
// The value of properties relevant for fo:leader.
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/ListItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/ListItem.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/ListItem.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/ListItem.java Tue Aug 17 18:57:04 2010
@@ -119,7 +119,7 @@ public class ListItem extends FObj imple
/**
* {@inheritDoc}
- * @todo see if can/should rely on base class for this
+ * @asf.todo see if can/should rely on base class for this
* (i.e., add to childNodes instead)
*/
public void addChildNode(FONode child) {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Marker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Marker.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Marker.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Marker.java Tue Aug 17 18:57:04 2010
@@ -19,7 +19,6 @@
package org.apache.fop.fo.flow;
-import java.util.Collections;
import java.util.Map;
import org.xml.sax.Attributes;
@@ -111,7 +110,7 @@ public class Marker extends FObjMixed {
* <br><i>Additionally: "An fo:marker may contain any formatting objects that
* are permitted as a replacement of any fo:retrieve-marker that retrieves
* the fo:marker's children."</i>
- * @todo implement "additional" constraint, possibly within fo:retrieve-marker
+ * @asf.todo implement "additional" constraint, possibly within fo:retrieve-marker
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
@@ -199,17 +198,25 @@ public class Marker extends FObjMixed {
name = attributes.getLocalName(i);
value = attributes.getValue(i);
- this.attribs[i] =
- MarkerAttribute.getInstance(namespace, qname, name, value);
+ this.attribs[i]
+ = MarkerAttribute.getInstance(namespace, qname, name, value);
}
}
- /** Null implementation; not used by this type of {@link PropertyList} */
+ /**
+ * Null implementation; not used by this type of {@link PropertyList}.
+ * @param propId the propert id
+ * @param value the property value
+ */
public void putExplicit(int propId, Property value) {
//nop
}
- /** Null implementation; not used by this type of {@link PropertyList} */
+ /**
+ * Null implementation; not used by this type of {@link PropertyList}.
+ * @param propId the propert id
+ * @return the property id
+ */
public Property getExplicit(int propId) {
return null;
}
@@ -259,7 +266,11 @@ public class Marker extends FObjMixed {
}
}
- /** Default implementation; not used */
+ /**
+ * Default implementation; not used.
+ * @param index a type index
+ * @return type string
+ */
public String getType(int index) {
return "CDATA";
}
@@ -305,12 +316,21 @@ public class Marker extends FObjMixed {
return index;
}
- /** Default implementation; not used */
+ /**
+ * Default implementation; not used
+ * @param name a type name
+ * @param namespace a type namespace
+ * @return type string
+ */
public String getType(String name, String namespace) {
return "CDATA";
}
- /** Default implementation; not used */
+ /**
+ * Default implementation; not used
+ * @param qname a type name
+ * @return type string
+ */
public String getType(String qname) {
return "CDATA";
}
@@ -337,12 +357,16 @@ public class Marker extends FObjMixed {
/** Convenience inner class */
public static final class MarkerAttribute {
- private static PropertyCache attributeCache =
- new PropertyCache(MarkerAttribute.class);
+ private static PropertyCache attributeCache
+ = new PropertyCache(MarkerAttribute.class);
+ /** namespace */
protected String namespace;
+ /** qualfied name */
protected String qname;
+ /** local name */
protected String name;
+ /** value */
protected String value;
/**
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiCase.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiCase.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiCase.java Tue Aug 17 18:57:04 2010
@@ -27,7 +27,7 @@ import org.apache.fop.fo.PropertyList;
/**
* Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_multi-case">
* <code>fo:multi-case</code></a> object.
- * @todo implement validateChildNode()
+ * @asf.todo implement validateChildNode()
*/
public class MultiCase extends FObj {
// The value of properties relevant for fo:multi-case.
@@ -38,7 +38,7 @@ public class MultiCase extends FObj {
// private CommonAccessibility commonAccessibility;
// End of property values
- static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven = false;
/**
* Base constructor
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiProperties.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiProperties.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiProperties.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiProperties.java Tue Aug 17 18:57:04 2010
@@ -37,11 +37,11 @@ public class MultiProperties extends FOb
// private CommonAccessibility commonAccessibility;
// End of property values
- static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven = false;
// used for input FO validation
- boolean hasMultiPropertySet = false;
- boolean hasWrapper = false;
+ private boolean hasMultiPropertySet = false;
+ private boolean hasWrapper = false;
/**
* Base constructor
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiPropertySet.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiPropertySet.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiPropertySet.java Tue Aug 17 18:57:04 2010
@@ -37,7 +37,7 @@ public class MultiPropertySet extends FO
// private ToBeImplementedProperty activeState;
// End of property values
- static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven = false;
/**
* Base constructor
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiSwitch.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiSwitch.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiSwitch.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiSwitch.java Tue Aug 17 18:57:04 2010
@@ -39,7 +39,7 @@ public class MultiSwitch extends FObj {
// private CommonAccessibility commonAccessibility;
// End of property values
- static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven = false;
/**
* Base constructor
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiToggle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiToggle.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiToggle.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/MultiToggle.java Tue Aug 17 18:57:04 2010
@@ -39,7 +39,7 @@ public class MultiToggle extends FObj {
// public ToBeImplementedProperty prSwitchTo;
// End of property values
- static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven = false;
/**
* Base constructor
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java Tue Aug 17 18:57:04 2010
@@ -16,6 +16,7 @@
*/
/* $Id$ */
+
package org.apache.fop.fo.flow;
import org.apache.fop.fo.FONode;
@@ -50,7 +51,9 @@ public class RetrieveTableMarker extends
* <i>NOTE: An <code>fo:retrieve-table-marker</code> is only permitted as a descendant
* of an <code>fo:table-header</code> or an <code>fo:table-footer</code>.</i>
*/
- public void processNode(String elementName, Locator locator, Attributes attlist, PropertyList pList) throws FOPException {
+ public void processNode
+ (String elementName, Locator locator, Attributes attlist, PropertyList pList)
+ throws FOPException {
if (findAncestor(FO_TABLE_HEADER) < 0
&& findAncestor(FO_TABLE_FOOTER) < 0) {
invalidChildError(locator, getParent().getName(), FO_URI, getName(),
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Wrapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Wrapper.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Wrapper.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/Wrapper.java Tue Aug 17 18:57:04 2010
@@ -76,7 +76,8 @@ public class Wrapper extends FObjMixed {
try {
FONode.validateChildNode(this.parent, loc, nsURI, localName);
} catch (ValidationException vex) {
- invalidChildError(loc, getName(), FO_URI, localName, "rule.wrapperInvalidChildForParent");
+ invalidChildError(loc, getName(), FO_URI, localName,
+ "rule.wrapperInvalidChildForParent");
}
blockOrInlineItemFound = true;
} else {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java Tue Aug 17 18:57:04 2010
@@ -77,8 +77,7 @@ public class ColumnNumberManager {
for (int i = 0; i < pendingSpans.size(); i++) {
pSpan = (PendingSpan) pendingSpans.get(i);
if (pSpan != null) {
- pSpan.rowsLeft--;
- if (pSpan.rowsLeft == 0) {
+ if ( pSpan.decrRowsLeft() == 0 ) {
pendingSpans.set(i, null);
} else {
usedColumnIndices.set(i);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java Tue Aug 17 18:57:04 2010
@@ -36,20 +36,23 @@ import org.apache.fop.layoutmgr.table.Co
*/
public class ConditionalBorder {
+ /** normal border */
public static final int NORMAL = 0;
+ /** leading and trailing border */
public static final int LEADING_TRAILING = 1;
+ /** all the rest */
public static final int REST = 2;
/** Normal case, no break. */
- BorderSpecification normal;
+ BorderSpecification normal; // CSOK: VisibilityModifier
/** Special case: the cell is at the top or the bottom of the page. */
- BorderSpecification leadingTrailing;
+ BorderSpecification leadingTrailing; // CSOK: VisibilityModifier
/** Special case: break inside the cell. */
- BorderSpecification rest;
+ BorderSpecification rest; // CSOK: VisibilityModifier
/** The model used to resolve borders. */
private CollapsingBorderModel collapsingBorderModel;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/GridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/GridUnit.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/GridUnit.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/GridUnit.java Tue Aug 17 18:57:04 2010
@@ -65,13 +65,13 @@ public class GridUnit {
private byte flags = 0;
/** the border-before specification */
- ConditionalBorder borderBefore;
+ ConditionalBorder borderBefore; // CSOK: VisibilityModifier
/** the border-after specification */
- ConditionalBorder borderAfter;
+ ConditionalBorder borderAfter; // CSOK: VisibilityModifier
/** the border-start specification */
- BorderSpecification borderStart;
+ BorderSpecification borderStart; // CSOK: VisibilityModifier
/** the border-end specification */
- BorderSpecification borderEnd;
+ BorderSpecification borderEnd; // CSOK: VisibilityModifier
/** The border model helper associated with the table */
protected CollapsingBorderModel collapsingBorderModel;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/PendingSpan.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/PendingSpan.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/PendingSpan.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/PendingSpan.java Tue Aug 17 18:57:04 2010
@@ -27,7 +27,7 @@ class PendingSpan {
/**
* member variable holding the number of rows left
*/
- int rowsLeft;
+ private int rowsLeft;
/**
* Constructor
@@ -37,4 +37,22 @@ class PendingSpan {
public PendingSpan(int rows) {
rowsLeft = rows;
}
+
+ /** @return number of rows spanned */
+ public int getRowsLeft() {
+ return rowsLeft;
+ }
+
+ /**
+ * Decrement rows spanned.
+ * @return number of rows spanned after decrementing
+ */
+ public int decrRowsLeft() {
+ if ( rowsLeft > 0 ) {
+ return --rowsLeft;
+ } else {
+ return 0;
+ }
+ }
+
}
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java Tue Aug 17 18:57:04 2010
@@ -85,6 +85,10 @@ public class PrimaryGridUnit extends Gri
return (TablePart) node;
}
+ /**
+ * Get cell's layout manager.
+ * @return the cell's layout manager
+ */
public TableCellLayoutManager getCellLM() {
assert cellLM != null;
return cellLM;
@@ -109,6 +113,10 @@ public class PrimaryGridUnit extends Gri
this.elements = elements;
}
+ /**
+ * Obtain the Knuth elements.
+ * @return a list of Knuth elements
+ */
public List getElements() {
return this.elements;
}
@@ -247,6 +255,10 @@ public class PrimaryGridUnit extends Gri
return this.rows;
}
+ /**
+ * Add a row.
+ * @param row the row to be added
+ */
public void addRow(GridUnit[] row) {
if (rows == null) {
rows = new java.util.ArrayList();
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java Tue Aug 17 18:57:04 2010
@@ -30,7 +30,7 @@ import org.apache.fop.fo.ValidationExcep
/**
* Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_table-and-caption">
* <code>fo:table-and-caption</code></a> property.
- * @todo needs implementation
+ * @asf.todo needs implementation
*/
public class TableAndCaption extends FObj /*implements BreakPropertySet*/ {
// The value of properties relevant for fo:table-and-caption.
@@ -50,7 +50,7 @@ public class TableAndCaption extends FOb
// private int textAlign;
// End of property values
- static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven = false;
/** used for FO validation */
private boolean tableCaptionFound = false;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableCaption.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableCaption.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableCaption.java Tue Aug 17 18:57:04 2010
@@ -49,7 +49,7 @@ public class TableCaption extends FObj {
/** used for FO validation */
private boolean blockItemFound = false;
- static boolean notImplementedWarningGiven = false;
+ private static boolean notImplementedWarningGiven = false;
/**
* Create a TableCaption instance with the given {@link FONode}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java Tue Aug 17 18:57:04 2010
@@ -30,14 +30,26 @@ import org.apache.fop.fo.FONode;
*/
public abstract class TableCellContainer extends TableFObj implements ColumnNumberManagerHolder {
+ /** list of pending spans */
protected List pendingSpans;
+ /** column number manager */
protected ColumnNumberManager columnNumberManager;
+ /**
+ * Construct table cell container.
+ * @param parent the parent node of the cell container
+ */
public TableCellContainer(FONode parent) {
super(parent);
}
+ /**
+ * Add cell to current row.
+ * @param cell a table cell to add
+ * @param firstRow true is first row
+ * @throws FOPException if exception occurs
+ */
protected void addTableCellChild(TableCell cell, boolean firstRow) throws FOPException {
int colNumber = cell.getColumnNumber();
int colSpan = cell.getNumberColumnsSpanned();
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java Tue Aug 17 18:57:04 2010
@@ -32,7 +32,10 @@ import org.apache.fop.fo.expr.PropertyEx
public interface TableEventProducer extends EventProducer {
/** Provider class for the event producer. */
- class Provider {
+ static final class Provider {
+
+ private Provider() {
+ }
/**
* Returns an event producer.
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableFObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableFObj.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableFObj.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableFObj.java Tue Aug 17 18:57:04 2010
@@ -50,12 +50,12 @@ public abstract class TableFObj extends
private Numeric borderStartPrecedence;
private String ptr;
- ConditionalBorder borderBefore;
- ConditionalBorder borderAfter;
- BorderSpecification borderStart;
- BorderSpecification borderEnd;
+ ConditionalBorder borderBefore; // CSOK: VisibilityModifier
+ ConditionalBorder borderAfter; // CSOK: VisibilityModifier
+ BorderSpecification borderStart; // CSOK: VisibilityModifier
+ BorderSpecification borderEnd; // CSOK: VisibilityModifier
- CollapsingBorderModel collapsingBorderModel;
+ CollapsingBorderModel collapsingBorderModel; // CSOK: VisibilityModifier
/**
* Create a TableFObj instance that is a child
@@ -205,9 +205,10 @@ public abstract class TableFObj extends
int foId = propertyList.getFObj().getNameId();
if (i <= 0) {
if (foId == FO_TABLE_CELL || foId == FO_TABLE_COLUMN) {
- ColumnNumberManagerHolder parent =
- (ColumnNumberManagerHolder) propertyList.getParentFObj();
- ColumnNumberManager columnIndexManager = parent.getColumnNumberManager();
+ ColumnNumberManagerHolder parent
+ = (ColumnNumberManagerHolder) propertyList.getParentFObj();
+ ColumnNumberManager columnIndexManager
+ = parent.getColumnNumberManager();
i = columnIndexManager.getCurrentColumnNumber();
} else {
/* very exceptional case:
@@ -216,10 +217,11 @@ public abstract class TableFObj extends
*/
i = 1;
}
- TableEventProducer eventProducer =
- TableEventProducer.Provider.get(fo.getUserAgent().getEventBroadcaster());
- eventProducer.forceNextColumnNumber(this, propertyList.getFObj().getName(),
- val, i, propertyList.getFObj().getLocator());
+ TableEventProducer eventProducer
+ = TableEventProducer.Provider.get(fo.getUserAgent().getEventBroadcaster());
+ eventProducer.forceNextColumnNumber
+ (this, propertyList.getFObj().getName(),
+ val, i, propertyList.getFObj().getLocator());
}
return NumberProperty.getInstance(i);
}
@@ -229,7 +231,9 @@ public abstract class TableFObj extends
}
/** {@inheritDoc} */
- public void processNode(String elementName, Locator locator, Attributes attlist, PropertyList pList) throws FOPException {
+ public void processNode
+ (String elementName, Locator locator, Attributes attlist, PropertyList pList)
+ throws FOPException {
super.processNode(elementName, locator, attlist, pList);
Table table = getTable();
if (!inMarker() && !table.isSeparateBorderModel()) {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TablePart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TablePart.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TablePart.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TablePart.java Tue Aug 17 18:57:04 2010
@@ -46,10 +46,9 @@ public abstract class TablePart extends
// private int visibility;
// End of property values
- /**
- * used for validation
- */
+ /** table rows found */
protected boolean tableRowsFound = false;
+ /** table cells found */
protected boolean tableCellsFound = false;
private boolean firstRow = true;
@@ -124,6 +123,10 @@ public abstract class TablePart extends
return this;
}
+ /**
+ * Finish last row group.
+ * @throws ValidationException if content validation exception
+ */
protected void finishLastRowGroup() throws ValidationException {
if (!inMarker()) {
RowGroupBuilder rowGroupBuilder = getTable().getRowGroupBuilder();
@@ -214,6 +217,7 @@ public abstract class TablePart extends
rowGroups.add(rowGroup);
}
+ /** @return list of row groups */
public List getRowGroups() {
return rowGroups;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableRow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableRow.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableRow.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableRow.java Tue Aug 17 18:57:04 2010
@@ -144,7 +144,6 @@ public class TableRow extends TableCellC
return (TablePart) parent;
}
- /** {@inheritDoc} */
boolean isTableRow() {
return true;
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java Tue Aug 17 18:57:04 2010
@@ -34,7 +34,9 @@ import org.apache.fop.fo.PropertyList;
public abstract class AbstractPageSequence extends FObj {
// The value of properties relevant for fo:page-sequence.
+ /** initial page number */
protected Numeric initialPageNumber;
+ /** forced page count */
protected int forcePageCount;
private String format;
private int letterValue;
@@ -45,6 +47,7 @@ public abstract class AbstractPageSequen
private PageNumberGenerator pageNumberGenerator;
+ /** starting page number */
protected int startingPageNumber = 0;
/**
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/PageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/PageSequence.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/PageSequence.java Tue Aug 17 18:57:04 2010
@@ -151,7 +151,7 @@ public class PageSequence extends Abstra
/**
* {@inheritDoc}
- * @todo see if addChildNode() should also be called for fo's other than
+ * @asf.todo see if addChildNode() should also be called for fo's other than
* fo:flow.
*/
public void addChildNode(FONode child) throws FOPException {
@@ -254,10 +254,9 @@ public class PageSequence extends Abstra
* @return the SimplePageMaster to use for this page
* @throws PageProductionException if there's a problem determining the page master
*/
- public SimplePageMaster getNextSimplePageMaster(int page,
- boolean isFirstPage,
- boolean isLastPage,
- boolean isBlank) throws PageProductionException {
+ public SimplePageMaster getNextSimplePageMaster
+ (int page, boolean isFirstPage, boolean isLastPage, boolean isBlank)
+ throws PageProductionException {
if (pageSequenceMaster == null) {
return simplePageMaster;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Region.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Region.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Region.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Region.java Tue Aug 17 18:57:04 2010
@@ -31,7 +31,6 @@ import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
/**
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/RegionBody.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/RegionBody.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/RegionBody.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/RegionBody.java Tue Aug 17 18:57:04 2010
@@ -106,8 +106,10 @@ public class RegionBody extends Region {
* Also the values are resolved relative to the page size
* and reference orientation.
*/
- PercentBaseContext pageWidthContext = getPageWidthContext(LengthBase.CONTAINING_BLOCK_WIDTH);
- PercentBaseContext pageHeightContext = getPageHeightContext(LengthBase.CONTAINING_BLOCK_WIDTH);
+ PercentBaseContext pageWidthContext
+ = getPageWidthContext(LengthBase.CONTAINING_BLOCK_WIDTH);
+ PercentBaseContext pageHeightContext
+ = getPageHeightContext(LengthBase.CONTAINING_BLOCK_WIDTH);
int start;
int end;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Root.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Root.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Root.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Root.java Tue Aug 17 18:57:04 2010
@@ -144,7 +144,11 @@ public class Root extends FObj {
}
- /** @inheritDoc */
+ /**
+ * @param loc location in the source file
+ * @param child the {@link FONode} to validate against
+ * @throws ValidationException if the incoming node is not a valid child for the given FO
+ */
protected void validateChildNode(Locator loc, FONode child) throws ValidationException {
if (child instanceof AbstractPageSequence) {
pageSequenceFound = true;
@@ -207,7 +211,8 @@ public class Root extends FObj {
* @param additionalPages the total pages generated by the sequence (for statistics)
* @throws IllegalArgumentException for negative additional page counts
*/
- public void notifyPageSequenceFinished(int lastPageNumber, int additionalPages) {
+ public void notifyPageSequenceFinished(int lastPageNumber, int additionalPages)
+ throws IllegalArgumentException {
if (additionalPages >= 0) {
totalPagesGenerated += additionalPages;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java Tue Aug 17 18:57:04 2010
@@ -57,7 +57,8 @@ public class BackgroundPositionShorthand
* specified, <code>background-position-vertical</code> is set
* to "50%".
*/
- public Property make(PropertyList propertyList, String value, FObj fo) throws PropertyException {
+ public Property make(PropertyList propertyList, String value, FObj fo)
+ throws PropertyException {
Property p = super.make(propertyList, value, fo);
if (p.getList().size() == 1) {
/* only background-position-horizontal specified
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderSpacingShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderSpacingShorthandParser.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderSpacingShorthandParser.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderSpacingShorthandParser.java Tue Aug 17 18:57:04 2010
@@ -29,6 +29,7 @@ import org.apache.fop.fo.expr.PropertyEx
*/
public class BorderSpacingShorthandParser extends GenericShorthandParser {
+ /** {@inheritDoc} */
protected Property convertValueForProperty(int propId, Property property,
PropertyMaker maker, PropertyList propertyList)
throws PropertyException {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java Tue Aug 17 18:57:04 2010
@@ -28,7 +28,8 @@ import org.apache.fop.fo.expr.PropertyEx
* border width described in 7.7.20.
*/
public class BorderWidthPropertyMaker extends LengthProperty.Maker {
- int borderStyleId = 0;
+
+ private int borderStyleId = 0;
/**
* Create a length property which check the value of the border-*-style
@@ -41,7 +42,7 @@ public class BorderWidthPropertyMaker ex
/**
* Set the propId of the style property for the same side.
- * @param borderStyleId
+ * @param borderStyleId the border style id
*/
public void setBorderStyleId(int borderStyleId) {
this.borderStyleId = borderStyleId;
@@ -55,8 +56,7 @@ public class BorderWidthPropertyMaker ex
public Property get(int subpropId, PropertyList propertyList,
boolean bTryInherit, boolean bTryDefault)
- throws PropertyException
- {
+ throws PropertyException {
Property p = super.get(subpropId, propertyList,
bTryInherit, bTryDefault);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CharacterProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CharacterProperty.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CharacterProperty.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CharacterProperty.java Tue Aug 17 18:57:04 2010
@@ -24,6 +24,8 @@ import org.apache.fop.fo.PropertyList;
/**
* Superclass for properties that wrap a character value
+ * @asf.todo convert character value to int in order to denote unicode scalar value
+ * instead of a single UTF-16 code element
*/
public final class CharacterProperty extends Property {
@@ -39,6 +41,7 @@ public final class CharacterProperty ext
super(propId);
}
+ /** {@inheritDoc} */
public Property make(PropertyList propertyList, String value,
FObj fo) {
char c = value.charAt(0);
@@ -48,7 +51,8 @@ public final class CharacterProperty ext
}
/** cache containing all canonical CharacterProperty instances */
- private static final PropertyCache cache = new PropertyCache(CharacterProperty.class);
+ private static final PropertyCache CACHE
+ = new PropertyCache(CharacterProperty.class);
private final char character;
@@ -59,8 +63,13 @@ public final class CharacterProperty ext
this.character = character;
}
+ /**
+ * Get character property instance for character.
+ * @param character the character
+ * @return the character property instance
+ */
public static CharacterProperty getInstance(char character) {
- return (CharacterProperty) cache.fetch(
+ return (CharacterProperty) CACHE.fetch(
new CharacterProperty(character));
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ColorProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ColorProperty.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ColorProperty.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ColorProperty.java Tue Aug 17 18:57:04 2010
@@ -33,7 +33,8 @@ import org.apache.fop.util.ColorUtil;
public final class ColorProperty extends Property {
/** cache holding canonical ColorProperty instances */
- private static final PropertyCache cache = new PropertyCache(ColorProperty.class);
+ private static final PropertyCache CACHE
+ = new PropertyCache(ColorProperty.class);
/**
* The color represented by this property.
@@ -97,11 +98,12 @@ public final class ColorProperty extends
* @throws PropertyException if the value can't be parsed
* @see ColorUtil#parseColorString(FOUserAgent, String)
*/
- public static ColorProperty getInstance(FOUserAgent foUserAgent, String value) throws PropertyException {
+ public static ColorProperty getInstance(FOUserAgent foUserAgent, String value)
+ throws PropertyException {
ColorProperty instance = new ColorProperty(
ColorUtil.parseColorString(
foUserAgent, value));
- return (ColorProperty)cache.fetch(instance);
+ return (ColorProperty)CACHE.fetch(instance);
}
/**
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java Tue Aug 17 18:57:04 2010
@@ -33,31 +33,32 @@ public class CommonAbsolutePosition {
/**
* The "absolute-position" property.
*/
- public int absolutePosition;
+ public int absolutePosition; // CSOK: VisibilityModifier
/**
* The "top" property.
*/
- public Length top;
+ public Length top; // CSOK: VisibilityModifier
/**
* The "right" property.
*/
- public Length right;
+ public Length right; // CSOK: VisibilityModifier
/**
* The "bottom" property.
*/
- public Length bottom;
+ public Length bottom; // CSOK: VisibilityModifier
/**
* The "left" property.
*/
- public Length left;
+ public Length left; // CSOK: VisibilityModifier
/**
* Create a CommonAbsolutePosition object.
* @param pList The PropertyList with propery values.
+ * @throws PropertyException if a property exception is raised
*/
public CommonAbsolutePosition(PropertyList pList) throws PropertyException {
absolutePosition = pList.get(Constants.PR_ABSOLUTE_POSITION).getEnum();
@@ -67,6 +68,7 @@ public class CommonAbsolutePosition {
right = pList.get(Constants.PR_RIGHT).getLength();
}
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer("CommonAbsolutePosition{");
sb.append(" absPos=");
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAccessibility.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAccessibility.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAccessibility.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAccessibility.java Tue Aug 17 18:57:04 2010
@@ -32,16 +32,17 @@ public class CommonAccessibility {
/**
* The "source-doc" property.
*/
- public String sourceDoc = null;
+ public String sourceDoc = null; // CSOK: VisibilityModifier
/**
* The "role" property.
*/
- public String role = null;
+ public String role = null; // CSOK: VisibilityModifier
/**
* Create a <code>CommonAccessibility</code> object.
* @param pList The PropertyList with propery values.
+ * @throws PropertyException if a property exception is raised
*/
public CommonAccessibility(PropertyList pList) throws PropertyException {
sourceDoc = pList.get(Constants.PR_SOURCE_DOCUMENT).getString();
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAural.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAural.java?rev=986451&r1=986450&r2=986451&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAural.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonAural.java Tue Aug 17 18:57:04 2010
@@ -30,92 +30,92 @@ public class CommonAural {
/**
* The "azimuth" property.
*/
- public int azimuth;
+ public int azimuth; // CSOK: VisibilityModifier
/**
* The "cueAfter" property.
*/
- public String cueAfter;
+ public String cueAfter; // CSOK: VisibilityModifier
/**
* The "cueBefore" property.
*/
- public String cueBefore;
+ public String cueBefore; // CSOK: VisibilityModifier
/**
* The "elevation" property.
*/
- public int elevation;
+ public int elevation; // CSOK: VisibilityModifier
/**
* The "pauseAfter" property.
*/
- public int pauseAfter;
+ public int pauseAfter; // CSOK: VisibilityModifier
/**
* The "pauseBefore" property.
*/
- public int pauseBefore;
+ public int pauseBefore; // CSOK: VisibilityModifier
/**
* The "pitch" property.
*/
- public int pitch;
+ public int pitch; // CSOK: VisibilityModifier
/**
* The "pitch-range" property.
*/
- public int pitchRange;
+ public int pitchRange; // CSOK: VisibilityModifier
/**
* The "playDuring" property.
*/
- public int playDuring;
+ public int playDuring; // CSOK: VisibilityModifier
/**
* The "richness" property.
*/
- public int richness;
+ public int richness; // CSOK: VisibilityModifier
/**
* The "speak" property.
*/
- public int speak;
+ public int speak; // CSOK: VisibilityModifier
/**
* The "speak-header" property.
*/
- public int speakHeader;
+ public int speakHeader; // CSOK: VisibilityModifier
/**
* The "speak-numeral" property.
*/
- public int speakNumeral;
+ public int speakNumeral; // CSOK: VisibilityModifier
/**
* The "speak-punctuation" property.
*/
- public int speakPunctuation;
+ public int speakPunctuation; // CSOK: VisibilityModifier
/**
* The "speech-rate" property.
*/
- public int speechRate;
+ public int speechRate; // CSOK: VisibilityModifier
/**
* The "stress" property.
*/
- public int stress;
+ public int stress; // CSOK: VisibilityModifier
/**
* The "voice-family" property.
*/
- public int voiceFamily;
+ public int voiceFamily; // CSOK: VisibilityModifier
/**
* The "volume" property.
*/
- public int volume;
+ public int volume; // CSOK: VisibilityModifier
/**
* Create a CommonAbsolutePosition object.
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org