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 2008/07/25 12:56:32 UTC
svn commit: r679758 [8/34] - in
/xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./
examples/embedding/java/embedding/ examples/embedding/java/embedding/events/
examples/embedding/java/embedding/intermediate/
examples/embedding/java/embedding/model/ ex...
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Footnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Footnote.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Footnote.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Footnote.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -42,7 +42,7 @@
/**
* Create a Footnote instance that is a child of the
* given {@link FONode}
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public Footnote(FONode parent) {
@@ -53,7 +53,7 @@
public void bind(PropertyList pList) throws FOPException {
// No active properties -> do nothing.
}
-
+
/** {@inheritDoc} */
protected void startOfNode() throws FOPException {
getFOEventHandler().startFootnote(this);
@@ -62,7 +62,7 @@
/**
* Make sure content model satisfied, if so then tell the
* {@link org.apache.fop.fo.FOEventHandler} that we are at the end of the footnote.
- *
+ *
* {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
@@ -78,11 +78,11 @@
* <br>XSL Content Model: (inline,footnote-body)
* @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
- * permitted to have as a descendant a fo:block-container that
+ * @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.
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (localName.equals("inline")) {
@@ -94,7 +94,7 @@
nodesOutOfOrderError(loc, "fo:inline", "fo:footnote-body");
} else if (footnoteBody != null) {
tooManyNodesError(loc, "fo:footnote-body");
- }
+ }
} else {
invalidChildError(loc, nsURI, localName);
}
@@ -112,7 +112,7 @@
/**
* Public accessor for inline FO
- *
+ *
* @return the {@link Inline} child
*/
public Inline getFootnoteCitation() {
@@ -121,7 +121,7 @@
/**
* Public accessor for footnote-body FO
- *
+ *
* @return the {@link FootnoteBody} child
*/
public FootnoteBody getFootnoteBody() {
@@ -132,7 +132,7 @@
public String getLocalName() {
return "footnote";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_FOOTNOTE}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/FootnoteBody.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/FootnoteBody.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/FootnoteBody.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/FootnoteBody.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
/**
* Base constructor
- *
+ *
* @param parent FONode that is the parent of this object
*/
public FootnoteBody(FONode parent) {
@@ -57,7 +57,7 @@
/**
* Make sure the content model is satisfied, if so then tell the
- * {@link org.apache.fop.fo.FOEventHandler} that we are at the
+ * {@link org.apache.fop.fo.FOEventHandler} that we are at the
* end of the footnote-body.
* {@inheritDoc}
*/
@@ -72,7 +72,7 @@
* {@inheritDoc}
* <br>XSL Content Model: (%block;)+
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (!isBlockItem(nsURI, localName)) {
@@ -85,7 +85,7 @@
public String getLocalName() {
return "footnote-body";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_FOOTNOTE_BODY}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InitialPropertySet.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InitialPropertySet.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InitialPropertySet.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -53,7 +53,7 @@
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public InitialPropertySet(FONode parent) {
@@ -72,7 +72,7 @@
* {@inheritDoc}
* <br>XSL Content Model: empty
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
invalidChildError(loc, nsURI, localName);
@@ -88,7 +88,7 @@
public String getLocalName() {
return "initial-property-set";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_INITIAL_PROPERTY_SET}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Inline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Inline.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Inline.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Inline.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,7 +52,7 @@
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public Inline(FONode parent) {
@@ -71,7 +71,7 @@
/** {@inheritDoc} */
protected void startOfNode() throws FOPException {
super.startOfNode();
-
+
/* Check to see if this node can have block-level children.
* See validateChildNode() below.
*/
@@ -106,12 +106,12 @@
* or fo:footnote may not have block-level children, unless it has a
* nearer ancestor that is an fo:inline-container." (paraphrased)</i>
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (localName.equals("marker")) {
if (blockOrInlineItemFound) {
- nodesOutOfOrderError(loc, "fo:marker",
+ nodesOutOfOrderError(loc, "fo:marker",
"(#PCDATA|%inline;|%block;)");
}
} else if (!isBlockOrInlineItem(nsURI, localName)) {
@@ -128,27 +128,27 @@
public Length getAlignmentAdjust() {
return alignmentAdjust;
}
-
+
/** @return the "alignment-baseline" property */
public int getAlignmentBaseline() {
return alignmentBaseline;
}
-
+
/** @return the "baseline-shift" property */
public Length getBaselineShift() {
return baselineShift;
}
-
+
/** @return the "dominant-baseline" property */
public int getDominantBaseline() {
return dominantBaseline;
}
-
+
/** {@inheritDoc} */
public String getLocalName() {
return "inline";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_INLINE}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InlineContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InlineContainer.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InlineContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InlineContainer.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,7 +39,7 @@
* <code>fo:inline-container</code></a> object.
*/
public class InlineContainer extends FObj {
-
+
// The value of properties relevant for fo:inline-container.
private Length alignmentAdjust;
private int alignmentBaseline;
@@ -69,7 +69,7 @@
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public InlineContainer(FONode parent) {
@@ -99,7 +99,7 @@
* {@inheritDoc}
* <br>XSL Content Model: marker* (%block;)+
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (localName.equals("marker")) {
@@ -125,27 +125,27 @@
public Length getAlignmentAdjust() {
return alignmentAdjust;
}
-
+
/** @return the "alignment-baseline" property */
public int getAlignmentBaseline() {
return alignmentBaseline;
}
-
+
/** @return the "baseline-shift" property */
public Length getBaselineShift() {
return baselineShift;
}
-
+
/** @return the "block-progression-dimension" property */
public LengthRangeProperty getBlockProgressionDimension() {
return blockProgressionDimension;
}
-
+
/** @return the "clip" property */
public int getClip() {
return clip;
}
-
+
/**@return Returns the {@link CommonBorderPaddingBackground} */
public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
return this.commonBorderPaddingBackground;
@@ -160,17 +160,17 @@
public int getDominantBaseline() {
return dominantBaseline;
}
-
+
/** @return the "keep-together" property */
public KeepProperty getKeepTogether() {
return keepTogether;
}
-
+
/** @return the "inline-progression-dimension" property */
public LengthRangeProperty getInlineProgressionDimension() {
return inlineProgressionDimension;
}
-
+
/** @return the "line-height" property */
public SpaceProperty getLineHeight() {
return lineHeight;
@@ -180,22 +180,22 @@
public int getOverflow() {
return overflow;
}
-
+
/** @return the "reference-orientation" property */
public int getReferenceOrientation() {
return referenceOrientation.getValue();
}
-
+
/** @return the "writing-mode" property */
public int getWritingMode() {
return writingMode;
}
-
+
/** {@inheritDoc} */
public String getLocalName() {
return "inline-container";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_INLINE_CONTAINER}
@@ -203,5 +203,5 @@
public int getNameId() {
return FO_INLINE_CONTAINER;
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InlineLevel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InlineLevel.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InlineLevel.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InlineLevel.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
* formatting objects.
*/
public abstract class InlineLevel extends FObjMixed {
-
+
// The value of properties relevant for inline-level FOs.
private CommonBorderPaddingBackground commonBorderPaddingBackground;
private CommonMarginInline commonMarginInline;
@@ -49,7 +49,7 @@
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
protected InlineLevel(FONode parent) {
@@ -76,7 +76,7 @@
/** @return the {@link CommonBorderPaddingBackground} */
public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
return commonBorderPaddingBackground;
- }
+ }
/** @return the {@link CommonFont} */
public CommonFont getCommonFont() {
@@ -92,15 +92,15 @@
public SpaceProperty getLineHeight() {
return lineHeight;
}
-
+
/** @return the "keep-with-next" property */
public KeepProperty getKeepWithNext() {
return keepWithNext;
}
-
+
/** @return the "keep-with-previous" property */
public KeepProperty getKeepWithPrevious() {
return keepWithPrevious;
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
* This is an atomic inline object that contains XML data.
*/
public class InstreamForeignObject extends AbstractGraphics {
-
+
// The value of properties relevant for fo:instream-foreign-object.
// All property values contained in AbstractGraphics
// End of property values
@@ -48,9 +48,9 @@
private boolean instrisicSizeDetermined;
private Length intrinsicAlignmentAdjust;
-
+
/**
- * Constructs an instream-foreign-object object
+ * Constructs an instream-foreign-object object
* (called by {@link org.apache.fop.fo.ElementMapping.Maker}).
*
* @param parent the parent {@link FONode}
@@ -61,7 +61,7 @@
/**
* Make sure content model satisfied, if so then tell the
- * {@link org.apache.fop.fo.FOEventHandler} that we are at
+ * {@link org.apache.fop.fo.FOEventHandler} that we are at
* the end of the instream-foreign-object.
* {@inheritDoc}
*/
@@ -76,7 +76,7 @@
* {@inheritDoc}
* <br>XSL Content Model: one (1) non-XSL namespace child
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
invalidChildError(loc, nsURI, localName);
@@ -89,7 +89,7 @@
public String getLocalName() {
return "instream-foreign-object";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_INSTREAM_FOREIGN_OBJECT}
@@ -139,7 +139,7 @@
prepareIntrinsicSize();
return intrinsicAlignmentAdjust;
}
-
+
/** {@inheritDoc} */
protected void addChildNode(FONode child) throws FOPException {
super.addChildNode(child);
@@ -149,5 +149,5 @@
public XMLObj getChildXMLObj() {
return (XMLObj) firstChild;
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Leader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Leader.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Leader.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Leader.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,7 +55,7 @@
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public Leader(FONode parent) {
@@ -130,22 +130,22 @@
public Length getAlignmentAdjust() {
return alignmentAdjust;
}
-
+
/** @return the "alignment-baseline" property */
public int getAlignmentBaseline() {
return alignmentBaseline;
}
-
+
/** @return the "baseline-shift" property */
public Length getBaselineShift() {
return baselineShift;
}
-
+
/** @return the "dominant-baseline" property */
public int getDominantBaseline() {
return dominantBaseline;
}
-
+
/** {@inheritDoc} */
public String getLocalName() {
return "leader";
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListBlock.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListBlock.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListBlock.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListBlock.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -56,13 +56,13 @@
/** extension properties */
private Length widowContentLimit;
private Length orphanContentLimit;
-
+
// used for child node validation
private boolean hasListItem = false;
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public ListBlock(FONode parent) {
@@ -89,10 +89,10 @@
super.startOfNode();
getFOEventHandler().startList(this);
}
-
+
/**
* Make sure the content model is satisfied, if so then tell the
- * {@link org.apache.fop.fo.FOEventHandler} that we are at the end
+ * {@link org.apache.fop.fo.FOEventHandler} that we are at the end
* of the list-block.
* {@inheritDoc}
*/
@@ -107,7 +107,7 @@
* {@inheritDoc}
* <br>XSL Content Model: marker* (list-item)+
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (localName.equals("marker")) {
@@ -171,7 +171,7 @@
public String getLocalName() {
return "list-block";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_LIST_BLOCK}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItem.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItem.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItem.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -56,7 +56,7 @@
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public ListItem(FONode parent) {
@@ -93,7 +93,7 @@
* {@inheritDoc}
* <br>XSL Content Model: marker* (list-item-label,list-item-body)
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (localName.equals("marker")) {
@@ -118,12 +118,12 @@
/**
* {@inheritDoc}
- * @todo see if can/should rely on base class for this
+ * @todo see if can/should rely on base class for this
* (i.e., add to childNodes instead)
*/
public void addChildNode(FONode child) {
int nameId = child.getNameId();
-
+
if (nameId == FO_LIST_ITEM_LABEL) {
label = (ListItemLabel) child;
} else if (nameId == FO_LIST_ITEM_BODY) {
@@ -184,7 +184,7 @@
public String getLocalName() {
return "list-item";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_LIST_ITEM}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItemBody.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItemBody.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItemBody.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItemBody.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,12 +46,12 @@
super.endOfNode();
getFOEventHandler().endListBody();
}
-
+
/** {@inheritDoc} */
public String getLocalName() {
return "list-item-body";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_LIST_ITEM_BODY}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItemLabel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItemLabel.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItemLabel.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/ListItemLabel.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public ListItemLabel(FONode parent) {
@@ -53,7 +53,7 @@
public String getLocalName() {
return "list-item-label";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_LIST_ITEM_LABEL}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Marker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Marker.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Marker.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Marker.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,7 +49,7 @@
/**
* Create a marker fo.
- *
+ *
* @param parent the parent {@link FONode}
*/
public Marker(FONode parent) {
@@ -59,32 +59,32 @@
/** {@inheritDoc} */
public void bind(PropertyList pList) throws FOPException {
if (findAncestor(FO_FLOW) < 0) {
- invalidChildError(locator, getParent().getName(), FO_URI, getName(),
+ invalidChildError(locator, getParent().getName(), FO_URI, getName(),
"rule.markerDescendantOfFlow");
}
-
+
markerClassName = pList.get(PR_MARKER_CLASS_NAME).getString();
-
+
if (markerClassName == null || markerClassName.equals("")) {
missingPropertyError("marker-class-name");
- }
+ }
}
-
+
/**
- * Retrieve the property list of the given {@link FONode}
+ * Retrieve the property list of the given {@link FONode}
* descendant
- *
+ *
* @param foNode the {@link FONode} whose property list is requested
* @return the {@link MarkerPropertyList} for the given node
*/
protected MarkerPropertyList getPropertyListFor(FONode foNode) {
- return (MarkerPropertyList)
+ return (MarkerPropertyList)
descendantPropertyLists.get(foNode);
}
-
+
/** {@inheritDoc} */
protected void startOfNode() {
- FOTreeBuilderContext builderContext = getBuilderContext();
+ FOTreeBuilderContext builderContext = getBuilderContext();
// Push a new property list maker which will make MarkerPropertyLists.
savePropertyListMaker = builderContext.getPropertyListMaker();
builderContext.setPropertyListMaker(new PropertyListMaker() {
@@ -95,7 +95,7 @@
}
});
}
-
+
/** {@inheritDoc} */
protected void endOfNode() throws FOPException {
super.endOfNode();
@@ -112,7 +112,7 @@
* the fo:marker's children."</i>
* @todo implement "additional" constraint, possibly within fo:retrieve-marker
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (!isBlockOrInlineItem(nsURI, localName)) {
@@ -120,12 +120,12 @@
}
}
}
-
+
/** {@inheritDoc} */
protected boolean inMarker() {
return true;
}
-
+
/** @return the "marker-class-name" property */
public String getMarkerClassName() {
return markerClassName;
@@ -135,7 +135,7 @@
public String getLocalName() {
return "marker";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_MARKER}
@@ -156,15 +156,15 @@
* specified properties/attributes as bundles of name-value-namespace
* strings
*/
- protected class MarkerPropertyList extends PropertyList
+ protected class MarkerPropertyList extends PropertyList
implements Attributes {
-
+
/** the array of attributes **/
private MarkerAttribute[] attribs;
-
+
/**
* Overriding default constructor
- *
+ *
* @param fobj the {@link FObj} to attach
* @param parentPropertyList ignored
*/
@@ -175,34 +175,34 @@
*/
super(fobj, null);
}
-
+
/**
* Override that doesn't convert the attributes to {@link Property}
* instances, but simply stores the attributes for later processing.
- *
+ *
* {@inheritDoc}
*/
- public void addAttributesToList(Attributes attributes)
+ public void addAttributesToList(Attributes attributes)
throws ValidationException {
-
+
this.attribs = new MarkerAttribute[attributes.getLength()];
String name;
String value;
String namespace;
String qname;
-
+
for (int i = attributes.getLength(); --i >= 0;) {
namespace = attributes.getURI(i);
qname = attributes.getQName(i);
name = attributes.getLocalName(i);
value = attributes.getValue(i);
-
- this.attribs[i] =
+
+ this.attribs[i] =
MarkerAttribute.getInstance(namespace, qname, name, value);
}
}
-
+
/** Null implementation; not used by this type of {@link PropertyList} */
public void putExplicit(int propId, Property value) {
//nop
@@ -224,7 +224,7 @@
/** {@inheritDoc} */
public String getURI(int index) {
- if (attribs != null
+ if (attribs != null
&& index < attribs.length
&& index >= 0
&& attribs[index] != null) {
@@ -236,7 +236,7 @@
/** {@inheritDoc} */
public String getLocalName(int index) {
- if (attribs != null
+ if (attribs != null
&& index < attribs.length
&& index >= 0
&& attribs[index] != null) {
@@ -248,7 +248,7 @@
/** {@inheritDoc} */
public String getQName(int index) {
- if (attribs != null
+ if (attribs != null
&& index < attribs.length
&& index >= 0
&& attribs[index] != null) {
@@ -265,7 +265,7 @@
/** {@inheritDoc} */
public String getValue(int index) {
- if (attribs != null
+ if (attribs != null
&& index < attribs.length
&& index >= 0
&& attribs[index] != null) {
@@ -295,7 +295,7 @@
int index = -1;
if (attribs != null && qname != null) {
for (int i = attribs.length; --i >= 0;) {
- if (attribs[i] != null
+ if (attribs[i] != null
&& qname.equals(attribs[i].qname)) {
break;
}
@@ -332,18 +332,18 @@
return null;
}
}
-
+
/** Convenience inner class */
private static final class MarkerAttribute {
-
- private static Map attributeCache =
+
+ private static Map attributeCache =
Collections.synchronizedMap(new java.util.WeakHashMap());
protected String namespace;
protected String qname;
protected String name;
protected String value;
-
+
/**
* Main constructor
* @param namespace the namespace URI
@@ -351,14 +351,14 @@
* @param name the name
* @param value the value
*/
- private MarkerAttribute(String namespace, String qname,
+ private MarkerAttribute(String namespace, String qname,
String name, String value) {
this.namespace = namespace;
this.qname = qname;
this.name = (name == null ? qname : name);
this.value = value;
}
-
+
/**
* Convenience method, reduces the number
* of distinct MarkerAttribute instances
@@ -367,13 +367,13 @@
* @param qname the fully qualified name of the attribute
* @param name the attribute name
* @param value the attribute value
- * @return the single MarkerAttribute instance corresponding to
+ * @return the single MarkerAttribute instance corresponding to
* the name/value-pair
*/
private static MarkerAttribute getInstance(
String namespace, String qname,
String name, String value) {
- MarkerAttribute newInstance =
+ MarkerAttribute newInstance =
new MarkerAttribute(namespace, qname, name, value);
if (attributeCache.containsKey(newInstance)) {
return (MarkerAttribute) attributeCache.get(newInstance);
@@ -382,7 +382,7 @@
return newInstance;
}
}
-
+
/** {@inheritDoc} */
public boolean equals(Object o) {
if (o instanceof MarkerAttribute) {
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiCase.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiCase.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -42,7 +42,7 @@
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public MultiCase(FONode parent) {
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiProperties.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiProperties.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiProperties.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiProperties.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,7 +45,7 @@
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public MultiProperties(FONode parent) {
@@ -69,7 +69,7 @@
* {@inheritDoc}
* <br>XSL Content Model: (multi-property-set+, wrapper)
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (localName.equals("multi-property-set")) {
@@ -89,7 +89,7 @@
}
}
}
-
+
/** {@inheritDoc} */
public String getLocalName() {
return "multi-properties";
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiPropertySet.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiPropertySet.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiPropertySet.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,7 +41,7 @@
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public MultiPropertySet(FONode parent) {
@@ -64,7 +64,7 @@
* {@inheritDoc}
* <br>XSL Content Model: empty
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
invalidChildError(loc, nsURI, localName);
@@ -75,7 +75,7 @@
public String getLocalName() {
return "multi-property-set";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_MULTI_PROPERTY_SET}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiSwitch.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiSwitch.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiSwitch.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiSwitch.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,7 +43,7 @@
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public MultiSwitch(FONode parent) {
@@ -74,7 +74,7 @@
* {@inheritDoc}
* <br>XSL Content Model: (multi-case+)
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (!localName.equals("multi-case")) {
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiToggle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiToggle.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiToggle.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/MultiToggle.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,12 +38,12 @@
// private CommonAccessibility commonAccessibility;
// public ToBeImplementedProperty prSwitchTo;
// End of property values
-
+
static boolean notImplementedWarningGiven = false;
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public MultiToggle(FONode parent) {
@@ -66,7 +66,7 @@
* {@inheritDoc}
* <br>XSL Content Model: (#PCDATA|%inline;|%block;)*
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (!isBlockOrInlineItem(nsURI, localName)) {
@@ -79,7 +79,7 @@
public String getLocalName() {
return "multi-toggle";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_MULTI_TOGGLE}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumber.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumber.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumber.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -68,12 +68,12 @@
// private int wrapOption;
// End of property values
- // Properties which are not explicitely listed but are still applicable
+ // Properties which are not explicitely listed but are still applicable
private Color color;
-
+
/**
* Base constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public PageNumber(FONode parent) {
@@ -113,7 +113,7 @@
* {@inheritDoc}
* <br>XSL Content Model: empty
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
invalidChildError(loc, nsURI, localName);
@@ -137,34 +137,34 @@
/** @return the "text-decoration" property. */
public CommonTextDecoration getTextDecoration() {
- return textDecoration;
+ return textDecoration;
}
/** @return the "alignment-adjust" property */
public Length getAlignmentAdjust() {
return alignmentAdjust;
}
-
+
/** @return the "alignment-baseline" property */
public int getAlignmentBaseline() {
return alignmentBaseline;
}
-
+
/** @return the "baseline-shift" property */
public Length getBaselineShift() {
return baselineShift;
}
-
+
/** @return the "dominant-baseline" property */
public int getDominantBaseline() {
return dominantBaseline;
}
-
+
/** @return the "line-height" property */
public SpaceProperty getLineHeight() {
return lineHeight;
}
-
+
/** {@inheritDoc} */
public String getLocalName() {
return "page-number";
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumberCitation.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumberCitation.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumberCitation.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +33,7 @@
/**
* Main constructor
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public PageNumberCitation(FONode parent) {
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,13 +34,13 @@
/**
* Main constructor
- *
+ *
* @param parent the parent {@link FONode}
*/
public PageNumberCitationLast(FONode parent) {
super(parent);
}
-
+
/** {@inheritDoc} */
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -57,7 +57,7 @@
public String getLocalName() {
return "page-number-citation-last";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_PAGE_NUMBER_CITATION_LAST}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveMarker.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveMarker.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveMarker.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -109,5 +109,5 @@
*/
public int getNameId() {
return FO_RETRIEVE_MARKER;
- }
+ }
}
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Wrapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Wrapper.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Wrapper.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/Wrapper.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,20 +31,20 @@
/**
* Class modelling the <a href=http://www.w3.org/TR/xsl/#fo_wrapper">
* <code>fo:wrapper</code></a> object.
- * The <code>fo:wrapper</code> object serves as a property holder for
+ * The <code>fo:wrapper</code> object serves as a property holder for
* its child node objects.
*/
public class Wrapper extends FObjMixed {
// The value of properties relevant for fo:wrapper.
// End of property values
-
+
// used for FO validation
private boolean blockOrInlineItemFound = false;
/**
* Create a Wrapper instance that is a child of the
* given {@link FONode}
- *
+ *
* @param parent {@link FONode} that is the parent of this object
*/
public Wrapper(FONode parent) {
@@ -54,16 +54,16 @@
/**
* {@inheritDoc}
* <br>XSL Content Model: marker* (#PCDATA|%inline;|%block;)*
- * <br><i>Additionally (unimplemented): "An fo:wrapper that is a child of an
- * fo:multi-properties is only permitted to have children that would
+ * <br><i>Additionally (unimplemented): "An fo:wrapper that is a child of an
+ * fo:multi-properties is only permitted to have children that would
* be permitted in place of the fo:multi-properties."</i>
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if ("marker".equals(localName)) {
if (blockOrInlineItemFound) {
- nodesOutOfOrderError(loc, "fo:marker",
+ nodesOutOfOrderError(loc, "fo:marker",
"(#PCDATA|%inline;|%block;)");
}
} else if (isBlockOrInlineItem(nsURI, localName)) {
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/BorderResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/BorderResolver.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/BorderResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/BorderResolver.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
/**
* Receives notification of the end of a row.
- *
+ *
* @param row the row that has just been finished
* @param container the FO element holding the given row
*/
@@ -37,7 +37,7 @@
/**
* Receives notification of the start of a table-header/footer/body.
- *
+ *
* @param part the part that has started
*/
void startPart(TablePart part);
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/BorderSpecification.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/BorderSpecification.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/BorderSpecification.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/BorderSpecification.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
/**
* Creates a new border specification.
- *
+ *
* @param borderInfo the border's informations
* @param holder the FO element declaring this border
*/
@@ -56,7 +56,7 @@
/**
* Returns this border's informations.
- *
+ *
* @return this border's informations
*/
public/*TODO*/ BorderInfo getBorderInfo() {
@@ -65,7 +65,7 @@
/**
* Returns the FO element declaring this border.
- *
+ *
* @return one of {@link Constants#FO_TABLE}, {@link Constants#FO_TABLE_COLUMN},
* {@link Constants#FO_TABLE_HEADER}, {@link Constants#FO_TABLE_FOOTER},
* {@link Constants#FO_TABLE_BODY}, {@link Constants#FO_TABLE_ROW},
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/CollapsingBorderResolver.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -82,7 +82,7 @@
/**
* Integrates border-before specified on the table and its column.
- *
+ *
* @param row the first row of the table (in the header, or in the body if the
* table has no header)
* @param withNormal
@@ -103,7 +103,7 @@
/**
* Resolves border-after for the first row, border-before for the second one.
- *
+ *
* @param rowBefore
* @param rowAfter
*/
@@ -129,7 +129,7 @@
/**
* Integrates border-after specified on the table and its columns.
- *
+ *
* @param row the last row of the footer, or of the last body if the table has no
* footer
* @param withNormal
@@ -149,7 +149,7 @@
* Integrates either border-before specified on the table and its columns if the
* table has no header, or border-after specified on the cells of the header's
* last row. For the case the grid unit are at the top of a page.
- *
+ *
* @param row
*/
void integrateLeadingBorders(List/*<GridUnit>*/ row) {
@@ -165,7 +165,7 @@
* Integrates either border-after specified on the table and its columns if the
* table has no footer, or border-before specified on the cells of the footer's
* first row. For the case the grid unit are at the bottom of a page.
- *
+ *
* @param row
*/
void integrateTrailingBorders(List/*<GridUnit>*/ row) {
@@ -193,7 +193,7 @@
* <li>Integrates the border-before of the containing part, if first row;</li>
* <li>Resolves border-start/end between grid units.</li>
* </ul>
- *
+ *
* @param row the row being finished
* @param container the containing element
*/
@@ -402,7 +402,7 @@
* TODO The border resolution must be done only once for each table column,
* even if it's repeated; otherwise, re-resolving against the table's borders
* will lead to null border specifications.
- *
+ *
* Eventually table columns should probably be cloned instead.
*/
index += col.getNumberColumnsRepeated();
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,7 +40,7 @@
/**
* Returns the number of the column that shall receive the next parsed cell.
- *
+ *
* @return a column number, 1-based
*/
int getCurrentColumnNumber() {
@@ -50,7 +50,7 @@
/**
* Flags columns <code>start</code> to <code>end</code> as occupied,
* and updates the number of the next available column.
- *
+ *
* @param start start number, inclusive, 1-based
* @param end end number, inclusive
*/
@@ -68,7 +68,7 @@
/**
* Resets the record of occupied columns, taking into account columns already occupied
* by previous spanning cells, and computes the number of the first free column.
- *
+ *
* @param pendingSpans List<PendingSpan> of possible spans over the next row
*/
void prepareForNextRow(List pendingSpans) {
@@ -95,7 +95,7 @@
/**
* Checks whether a given column-number is already in use
* for the current row.
- *
+ *
* @param colNr the column-number to check
* @return true if column-number is already occupied
*/
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ColumnNumberManagerHolder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ColumnNumberManagerHolder.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ColumnNumberManagerHolder.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ColumnNumberManagerHolder.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@
/**
* Returns the encapsulated ColumnNumberManage instance.
- *
+ *
* @return a {@link ColumnNumberManager} instance
*/
ColumnNumberManager getColumnNumberManager();
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -65,7 +65,7 @@
/**
* Creates a new conditional border.
- *
+ *
* @param borderSpecification the border specification to take as a basis
* @param collapsingBorderModel the model that will be used to resolved borders
*/
@@ -83,7 +83,7 @@
/**
* Resolves and updates the relevant parts of this border as well as the given one.
- *
+ *
* @param competitor
* @param withNormal
* @param withLeadingTrailing
@@ -122,7 +122,7 @@
* {@link #integrateSegment(ConditionalBorder, boolean, boolean, boolean)}, this
* method nicely handles the case where the CollapsingBorderModel returns null, by
* keeping the components to their old values.
- *
+ *
* @param competitor
* @param withNormal
* @param withLeadingTrailing
@@ -156,7 +156,7 @@
/**
* Updates this border after taking into account the given segment. The
* CollapsingBorderModel is not expected to return null.
- *
+ *
* @param segment
* @param withNormal
* @param withLeadingTrailing
@@ -181,7 +181,7 @@
/**
* Returns a shallow copy of this border.
- *
+ *
* @return a copy of this border
*/
ConditionalBorder copy() {
@@ -195,7 +195,7 @@
/**
* Returns a default border specification.
- *
+ *
* @param collapsingBorderModel the model that will be used to resolve borders
* @return a border with style 'none' for all of the three components
*/
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/EffRow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/EffRow.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/EffRow.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/EffRow.java Fri Jul 25 03:55:49 2008
@@ -34,19 +34,19 @@
* the row as well as some additional values.
*/
public class EffRow {
-
+
/** Indicates that the row is the first in a table-body */
public static final int FIRST_IN_PART = GridUnit.FIRST_IN_PART;
/** Indicates that the row is the last in a table-body */
public static final int LAST_IN_PART = GridUnit.LAST_IN_PART;
-
+
private List gridUnits = new java.util.ArrayList();
private int index;
/** One of HEADER, FOOTER, BODY */
private int bodyType;
private MinOptMax height;
private MinOptMax explicitHeight;
-
+
/**
* Creates a new effective row instance.
* @param index index of the row
@@ -70,45 +70,45 @@
public int getIndex() {
return this.index;
}
-
+
/**
- * @return an indicator what type of body this EffRow is in (one of HEADER, FOOTER, BODY
+ * @return an indicator what type of body this EffRow is in (one of HEADER, FOOTER, BODY
* as found on TableRowIterator)
*/
public int getBodyType() {
return this.bodyType;
}
-
+
/** @return the table-row FO for this EffRow, or null if there is no table-row. */
public TableRow getTableRow() {
return getGridUnit(0).getRow();
}
-
+
/**
* Returns the calculated height for this EffRow, including the cells'
* bpds/paddings/borders, and the table's border-separation.
- *
+ *
* @return the row's height
*/
public MinOptMax getHeight() {
return this.height;
}
-
+
/**
* Sets the calculated height for this EffRow, including everything (cells' bpds,
* paddings, borders, and border-separation).
- *
+ *
* @param mom the calculated height
*/
public void setHeight(MinOptMax mom) {
this.height = mom;
}
-
+
/** @return the explicit height of the EffRow (as specified through properties) */
public MinOptMax getExplicitHeight() {
return this.explicitHeight;
}
-
+
/**
* Sets the height for this row that resulted from the explicit height properties specified
* by the user.
@@ -117,12 +117,12 @@
public void setExplicitHeight(MinOptMax mom) {
this.explicitHeight = mom;
}
-
+
/** @return the list of GridUnits for this EffRow */
public List getGridUnits() {
return gridUnits;
}
-
+
/**
* Returns the grid unit at a given position.
* @param column index of the grid unit in the row (zero based)
@@ -131,9 +131,9 @@
public GridUnit getGridUnit(int column) {
return (GridUnit)gridUnits.get(column);
}
-
+
/**
- * Returns the grid unit at a given position. In contrast to getGridUnit() this
+ * Returns the grid unit at a given position. In contrast to getGridUnit() this
* method returns null if there's no grid unit at the given position. The number of
* grid units for row x can be smaller than the number of grid units for row x-1.
* @param column index of the grid unit in the row (zero based)
@@ -167,7 +167,7 @@
/**
* Returns the strength of the keep constraint if the enclosing (if any) fo:table-row element
* of this row, or if any of the cells starting on this row, have keep-with-previous set.
- *
+ *
* @return the strength of the keep-with-previous constraint
*/
public int getKeepWithPreviousStrength() {
@@ -189,7 +189,7 @@
/**
* Returns the strength of the keep constraint if the enclosing (if any) fo:table-row element
* of this row, or if any of the cells ending on this row, have keep-with-next set.
- *
+ *
* @return the strength of the keep-with-next constraint
*/
public int getKeepWithNextStrength() {
@@ -224,7 +224,7 @@
}
return strength;
}
-
+
/**
* Returns the break class for this row. This is a combination of break-before set on
* the first children of any cells starting on this row.
@@ -233,7 +233,7 @@
* belongs to a group of spanned rows (see XSL-FO 1.1, 7.20.2).
* <p><strong>Note:</strong> this works only after getNextKuthElements on the
* corresponding TableCellLM have been called!</p>
- *
+ *
* @return one of {@link Constants#EN_AUTO}, {@link Constants#EN_COLUMN}, {@link
* Constants#EN_PAGE}, {@link Constants#EN_EVEN_PAGE}, {@link Constants#EN_ODD_PAGE}
*/
@@ -257,7 +257,7 @@
* belongs to a group of spanned rows (see XSL-FO 1.1, 7.20.1).
* <p><strong>Note:</strong> this works only after getNextKuthElements on the
* corresponding TableCellLM have been called!</p>
- *
+ *
* @return one of {@link Constants#EN_AUTO}, {@link Constants#EN_COLUMN}, {@link
* Constants#EN_PAGE}, {@link Constants#EN_EVEN_PAGE}, {@link Constants#EN_ODD_PAGE}
*/
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/GridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/GridUnit.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/GridUnit.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/GridUnit.java Fri Jul 25 03:55:49 2008
@@ -78,7 +78,7 @@
/**
* Creates a new grid unit.
- *
+ *
* @param table the containing table
* @param colSpanIndex index of this grid unit in the span, in column direction
* @param rowSpanIndex index of this grid unit in the span, in row direction
@@ -90,7 +90,7 @@
/**
* Creates a new grid unit.
- *
+ *
* @param cell table cell which occupies this grid unit
* @param colSpanIndex index of this grid unit in the span, in column direction
* @param rowSpanIndex index of this grid unit in the span, in row direction
@@ -103,7 +103,7 @@
/**
* Creates a new grid unit.
- *
+ *
* @param primary the before-start grid unit of the cell containing this grid unit
* @param colSpanIndex index of this grid unit in the span, in column direction
* @param rowSpanIndex index of this grid unit in the span, in row direction
@@ -161,7 +161,7 @@
/**
* Returns the fo:table-row element (if any) this grid unit belongs to.
- *
+ *
* @return the row containing this grid unit, or null if there is no fo:table-row
* element in the corresponding table-part
*/
@@ -175,7 +175,7 @@
/**
* Returns the before-start grid unit of the cell containing this grid unit.
- *
+ *
* @return the before-start grid unit of the cell containing this grid unit.
*/
public PrimaryGridUnit getPrimary() {
@@ -184,7 +184,7 @@
/**
* Is this grid unit the before-start grid unit of the cell?
- *
+ *
* @return true if this grid unit is the before-start grid unit of the cell
*/
public boolean isPrimary() {
@@ -193,7 +193,7 @@
/**
* Does this grid unit belong to an empty cell?
- *
+ *
* @return true if this grid unit belongs to an empty cell
*/
public boolean isEmpty() {
@@ -227,7 +227,7 @@
/**
* Returns the resolved border-before of this grid unit, in the collapsing-border
* model.
- *
+ *
* @param which one of {@link ConditionalBorder#NORMAL},
* {@link ConditionalBorder#LEADING_TRAILING} or {@link ConditionalBorder#REST}
* @return the corresponding border
@@ -249,7 +249,7 @@
/**
* Returns the resolved border-after of this grid unit, in the collapsing-border
* model.
- *
+ *
* @param which one of {@link ConditionalBorder#NORMAL},
* {@link ConditionalBorder#LEADING_TRAILING} or {@link ConditionalBorder#REST}
* @return the corresponding border
@@ -271,7 +271,7 @@
/**
* Returns the resolved border-start of this grid unit, in the collapsing-border
* model.
- *
+ *
* @return the corresponding border
*/
public BorderInfo getBorderStart() {
@@ -281,7 +281,7 @@
/**
* Returns the resolved border-end of this grid unit, in the collapsing-border
* model.
- *
+ *
* @return the corresponding border
*/
public BorderInfo getBorderEnd() {
@@ -291,7 +291,7 @@
/**
* Resolve collapsing borders for the given cell. Used in case of the collapsing
* border model.
- *
+ *
* @param other neighbouring grid unit
* @param side the side to resolve (one of
* CommonBorderPaddingBackground.BEFORE|AFTER|START|END)
@@ -327,7 +327,7 @@
/**
* For the given side, integrates in the conflict resolution the border segment of the
* given parent element.
- *
+ *
* @param side the side to consider (either CommonBorderPaddingBackground.BEFORE or
* AFTER)
* @param parent a table element whose corresponding border coincides on the given
@@ -351,7 +351,7 @@
/**
* For the given side, integrates in the conflict resolution the border segment of the
* given parent element.
- *
+ *
* @param side the side to consider (one of
* CommonBorderPaddingBackground.BEFORE|AFTER|START|END)
* @param parent a table element whose corresponding border coincides on the given side
@@ -376,7 +376,7 @@
/**
* For the given side, integrates in the conflict resolution the given border segment.
- *
+ *
* @param side the side to consider (one of CommonBorderPaddingBackground.START|END)
* @param segment a border specification to integrate at the given side
*/
@@ -409,7 +409,7 @@
/**
* Returns a flag for this GridUnit.
- *
+ *
* @param which the requested flag
* @return the value of the flag
*/
@@ -419,7 +419,7 @@
/**
* Sets a flag on a GridUnit.
- *
+ *
* @param which the flag to set
* @param value the new value for the flag
*/
@@ -433,7 +433,7 @@
/**
* Sets the given flag on this grid unit.
- *
+ *
* @param which the flag to set
*/
public void setFlag(int which) {
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/PendingSpan.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/PendingSpan.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/PendingSpan.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/table/PendingSpan.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
/**
* Constructor
- *
+ *
* @param rows number of rows spanned
*/
public PendingSpan(int rows) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org