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 sp...@apache.org on 2007/09/25 16:31:37 UTC
svn commit: r579260 [3/11] - in
/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking: ./
src/documentation/content/xdocs/ src/java/org/apache/fop/apps/
src/java/org/apache/fop/area/ src/java/org/apache/fop/area/inline/
src/java/org/apache/fop/...
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java Tue Sep 25 07:31:06 2007
@@ -80,12 +80,12 @@
this.readOnly = readOnly;
}
- /** @see org.apache.fop.fo.extensions.ExtensionAttachment#getCategory() */
+ /** {@inheritDoc} */
public String getCategory() {
return CATEGORY;
}
- /** @see org.apache.fop.util.XMLizable#toSAX(org.xml.sax.ContentHandler) */
+ /** {@inheritDoc} */
public void toSAX(ContentHandler handler) throws SAXException {
getMetadata().toSAX(handler);
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/AbstractGraphics.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/AbstractGraphics.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/AbstractGraphics.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/AbstractGraphics.java Tue Sep 25 07:31:06 2007
@@ -24,12 +24,7 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
-import org.apache.fop.fo.properties.CommonMarginInline;
-import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
import org.apache.fop.fo.properties.SpaceProperty;
@@ -82,7 +77,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
@@ -236,6 +231,12 @@
* @return the "alignment-adjust" property
*/
public Length getAlignmentAdjust() {
+ if (alignmentAdjust.getEnum() == EN_AUTO) {
+ final Length intrinsicAlignmentAdjust = this.getIntrinsicAlignmentAdjust();
+ if (intrinsicAlignmentAdjust != null) {
+ return intrinsicAlignmentAdjust;
+ }
+ }
return alignmentAdjust;
}
@@ -261,12 +262,17 @@
}
/**
- * @return the graphics intrinsic width
+ * @return the graphics intrinsic width in millipoints
*/
public abstract int getIntrinsicWidth();
/**
- * @return the graphics intrinsic height
+ * @return the graphics intrinsic height in millipoints
*/
public abstract int getIntrinsicHeight();
+
+ /**
+ * @return the graphics intrinsic alignment-adjust
+ */
+ public abstract Length getIntrinsicAlignmentAdjust();
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java Tue Sep 25 07:31:06 2007
@@ -26,11 +26,10 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
import org.apache.fop.fo.properties.KeepProperty;
/**
- * Class modelling the fo:list-item-body object.
+ * Common superclass for list-item-label and list-item-body.
*/
public abstract class AbstractListItemPart extends FObj {
// The value of properties relevant for fo:list-item-label and fo:list-item-body.
@@ -50,7 +49,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -58,7 +57,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* (%block;)+
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -75,7 +74,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
if (!this.blockItemFound) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BasicLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BasicLink.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BasicLink.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BasicLink.java Tue Sep 25 07:31:06 2007
@@ -27,7 +27,7 @@
import org.apache.fop.fo.ValidationException;
/**
- * The fo:basic-link formatting object.
+ * Class modelling the fo:basic-link object.
*
* This class contains the logic to determine the link represented by this FO,
* and whether that link is external (uses a URI) or internal (an id
@@ -58,7 +58,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -82,7 +82,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -90,7 +90,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
super.endOfNode();
@@ -98,7 +98,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc} String, String)
* XSL Content Model: marker* (#PCDATA|%inline;|%block;)*
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -142,12 +142,12 @@
return externalDestination != null && externalDestination.length() > 0;
}
- /** @see org.apache.fop.fo.FObj#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "basic-link";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_BASIC_LINK;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BidiOverride.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BidiOverride.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BidiOverride.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BidiOverride.java Tue Sep 25 07:31:06 2007
@@ -19,21 +19,16 @@
package org.apache.fop.fo.flow;
-import java.awt.Color;
-
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObjMixed;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonFont;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.SpaceProperty;
import org.xml.sax.Locator;
/**
- * fo:bidi-override element.
+ * Class modelling the fo:bidi-override object.
*/
public class BidiOverride extends FObjMixed {
@@ -82,7 +77,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
// prDirection = pList.get(PR_DIRECTION);
@@ -93,7 +88,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* (#PCDATA|%inline;|%block;)*
* Additionally: "An fo:bidi-override that is a descendant of an fo:leader
* or of the fo:inline child of an fo:footnote may not have block-level
@@ -127,13 +122,13 @@
return lineHeight;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "bidi-override";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_BIDI_OVERRIDE;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Block.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Block.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Block.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Block.java Tue Sep 25 07:31:06 2007
@@ -95,7 +95,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -131,7 +131,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -139,7 +139,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
super.endOfNode();
@@ -276,7 +276,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* initial-property-set? (#PCDATA|%inline;|%block;)*
* Additionally: "An fo:bidi-override that is a descendant of an fo:leader
* or of the fo:inline child of an fo:footnote may not have block-level
@@ -363,18 +363,18 @@
return this.lineHeightShiftAdjustment;
}
- /** @see org.apache.fop.fo.FONode#charIterator() */
+ /** {@inheritDoc} */
public CharIterator charIterator() {
return NullCharIterator.getInstance();
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "block";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_BLOCK;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BlockContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BlockContainer.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BlockContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/BlockContainer.java Tue Sep 25 07:31:06 2007
@@ -73,7 +73,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -98,7 +98,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -106,7 +106,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* (%block;)+
* But: "In addition an fo:block-container that does not generate an
* absolutely positioned area may have a sequence of zero or more
@@ -127,7 +127,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
if (!blockItemFound) {
@@ -251,13 +251,13 @@
return height;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "block-container";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_BLOCK_CONTAINER;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Character.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Character.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Character.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Character.java Tue Sep 25 07:31:06 2007
@@ -29,30 +29,26 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonFont;
import org.apache.fop.fo.properties.CommonHyphenation;
-import org.apache.fop.fo.properties.CommonMarginInline;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.CommonTextDecoration;
-import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.properties.SpaceProperty;
-import org.apache.fop.util.CharUtilities;
import org.xml.sax.Locator;
/**
- * This class represents the flow object 'fo:character'. Its use is defined by
- * the spec: "The fo:character flow object represents a character that is mapped to
- * a glyph for presentation. It is an atomic unit to the formatter.
- * When the result tree is interpreted as a tree of formatting objects,
- * a character in the result tree is treated as if it were an empty
- * element of type fo:character with a character attribute
- * equal to the Unicode representation of the character.
- * The semantics of an "auto" value for character properties, which is
- * typically their initial value, are based on the Unicode codepoint.
- * Overrides may be specified in an implementation-specific manner." (6.6.3)
+ * Class modelling the fo:character object.
+ * Its use is defined by the spec:
+ * "The fo:character flow object represents a character that is mapped to
+ * a glyph for presentation. It is an atomic unit to the formatter.
+ * When the result tree is interpreted as a tree of formatting objects,
+ * a character in the result tree is treated as if it were an empty
+ * element of type fo:character with a character attribute
+ * equal to the Unicode representation of the character.
+ * The semantics of an "auto" value for character properties, which is
+ * typically their initial value, are based on the Unicode codepoint.
+ * Overrides may be specified in an implementation-specific manner." (6.6.3)
*
*/
public class Character extends FObj {
@@ -102,7 +98,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -126,7 +122,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -134,7 +130,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -143,7 +139,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#charIterator
+ * {@inheritDoc}
*/
public CharIterator charIterator() {
return new FOCharIterator(this);
@@ -238,13 +234,13 @@
return wordSpacing;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "character";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_CHARACTER;
@@ -273,9 +269,7 @@
}
public void remove() {
- foChar.character = CharUtilities.CODE_EOT;
- getFOEventHandler().getXMLWhiteSpaceHandler()
- .addDiscardableFOChar(foChar);
+ foChar.parent.removeChild(foChar);
}
public void replaceChar(char c) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ExternalGraphic.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ExternalGraphic.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ExternalGraphic.java Tue Sep 25 07:31:06 2007
@@ -21,6 +21,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
@@ -29,7 +30,7 @@
import org.xml.sax.Locator;
/**
- * External graphic formatting object.
+ * Class modelling the fo:external-graphic object.
* This FO node handles the external graphic. It creates an image
* inline area that can be added to the area tree.
*/
@@ -44,6 +45,7 @@
private String url;
private int intrinsicWidth;
private int intrinsicHeight;
+ private Length intrinsicAlignmentAdjust;
/**
* Create a new External graphic node.
@@ -55,7 +57,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -75,12 +77,13 @@
}
this.intrinsicWidth = fopimage.getIntrinsicWidth();
this.intrinsicHeight = fopimage.getIntrinsicHeight();
+ this.intrinsicAlignmentAdjust = fopimage.getIntrinsicAlignmentAdjust();
}
//TODO Report to caller so he can decide to throw an exception
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -88,7 +91,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -110,30 +113,37 @@
return url;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "external-graphic";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_EXTERNAL_GRAPHIC;
}
/**
- * @see org.apache.fop.fo.flow.AbstractGraphics#getIntrinsicWidth()
+ * {@inheritDoc}
*/
public int getIntrinsicWidth() {
return this.intrinsicWidth;
}
/**
- * @see org.apache.fop.fo.flow.AbstractGraphics#getIntrinsicHeight()
+ * {@inheritDoc}
*/
public int getIntrinsicHeight() {
return this.intrinsicHeight;
}
-
+
+ /**
+ * {@inheritDoc}
+ */
+ public Length getIntrinsicAlignmentAdjust() {
+ return this.intrinsicAlignmentAdjust;
+ }
+
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Float.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Float.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Float.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Float.java Tue Sep 25 07:31:06 2007
@@ -29,7 +29,7 @@
import org.apache.fop.fo.ValidationException;
/**
- * fo:float element.
+ * Class modelling the fo:float object.
*/
public class Float extends FObj {
// The value of properties relevant for fo:float (commented out for performance.
@@ -52,14 +52,14 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
// No active properties -> Nothing to do.
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: (%block;)+
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -70,23 +70,21 @@
}
/**
- * Make sure content model satisfied, if so then tell the
- * FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
- if (childNodes == null) {
+ if (firstChild == null) {
missingChildElementError("(%block;)+");
}
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "float";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_FLOAT;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Footnote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Footnote.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Footnote.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Footnote.java Tue Sep 25 07:31:06 2007
@@ -26,7 +26,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
* Class modelling the fo:footnote object.
@@ -47,14 +46,14 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
// No active properties -> do nothing.
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
getFOEventHandler().startFootnote(this);
@@ -63,7 +62,7 @@
/**
* Make sure content model satisfied, if so then tell the
* FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
super.endOfNode();
@@ -74,7 +73,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* 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.
@@ -100,7 +99,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#addChildNode(FONode)
+ * {@inheritDoc}
*/
public void addChildNode(FONode child) {
if (((FObj)child).getNameId() == FO_INLINE) {
@@ -126,13 +125,13 @@
return footnoteBody;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "footnote";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_FOOTNOTE;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/FootnoteBody.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/FootnoteBody.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/FootnoteBody.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/FootnoteBody.java Tue Sep 25 07:31:06 2007
@@ -27,7 +27,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
* Class modelling the fo:footnote-body object.
@@ -45,13 +44,13 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
getFOEventHandler().startFootnoteBody(this);
@@ -60,17 +59,17 @@
/**
* Make sure content model satisfied, if so then tell the
* FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
- if (childNodes == null) {
+ if (firstChild == null) {
missingChildElementError("(%block;)+");
}
getFOEventHandler().endFootnoteBody(this);
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: (%block;)+
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -80,13 +79,13 @@
}
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "footnote-body";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_FOOTNOTE_BODY;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InitialPropertySet.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InitialPropertySet.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InitialPropertySet.java Tue Sep 25 07:31:06 2007
@@ -20,8 +20,6 @@
package org.apache.fop.fo.flow;
// XML
-import java.awt.Color;
-
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
@@ -29,11 +27,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
-import org.apache.fop.fo.properties.CommonFont;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.SpaceProperty;
/**
@@ -41,7 +34,6 @@
*/
public class InitialPropertySet extends FObj {
// The value of properties relevant for fo:initial-property-set.
- private String id;
// private ToBeImplementedProperty letterSpacing;
private SpaceProperty lineHeight;
// private ToBeImplementedProperty textShadow;
@@ -66,7 +58,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -76,7 +68,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -91,13 +83,13 @@
return lineHeight;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "initial-property-set";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_INITIAL_PROPERTY_SET;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Inline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Inline.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Inline.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Inline.java Tue Sep 25 07:31:06 2007
@@ -23,14 +23,9 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Length;
-import org.apache.fop.fo.CharIterator;
import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.OneCharIterator;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.fo.properties.KeepProperty;
-import org.apache.fop.fo.properties.LengthRangeProperty;
/**
* Class modelling the fo:inline formatting object.
@@ -47,9 +42,6 @@
// private LengthRangeProperty blockProgressionDimension;
// private Length height;
// private LengthRangeProperty inlineProgressionDimension;
- // private KeepProperty keepTogether;
- // private KeepProperty keepWithNext;
- // private KeepProperty keepWithPrevious;
// private Length width;
// private int wrapOption;
// End of property values
@@ -65,7 +57,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -76,7 +68,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -103,7 +95,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
super.endOfNode();
@@ -111,7 +103,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* (#PCDATA|%inline;|%block;)*
* Additionally: " An fo:inline that is a descendant of an fo:leader
* or fo:footnote may not have block-level children, unless it has a
@@ -166,14 +158,12 @@
return dominantBaseline;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "inline";
}
- /**
- * @see org.apache.fop.fo.FObj#getNameId()
- */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_INLINE;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InlineContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InlineContainer.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InlineContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InlineContainer.java Tue Sep 25 07:31:06 2007
@@ -23,16 +23,10 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Length;
-import org.apache.fop.datatypes.Numeric;
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.properties.CommonBorderPaddingBackground;
-import org.apache.fop.fo.properties.CommonMarginInline;
-import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.fo.properties.KeepProperty;
-import org.apache.fop.fo.properties.LengthRangeProperty;
import org.apache.fop.fo.properties.SpaceProperty;
/**
@@ -75,7 +69,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -88,7 +82,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* (%block;)+
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -105,7 +99,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
if (!blockItemFound) {
@@ -148,13 +142,13 @@
return lineHeight;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "inline-container";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_INLINE_CONTAINER;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InlineLevel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InlineLevel.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InlineLevel.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InlineLevel.java Tue Sep 25 07:31:06 2007
@@ -30,6 +30,7 @@
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonFont;
import org.apache.fop.fo.properties.CommonMarginInline;
+import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.SpaceProperty;
/**
@@ -57,7 +58,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -107,4 +108,3 @@
}
}
-
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java Tue Sep 25 07:31:06 2007
@@ -21,15 +21,15 @@
import java.awt.geom.Point2D;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.ValidationException;
import org.apache.fop.fo.XMLObj;
import org.xml.sax.Locator;
/**
- * The instream-foreign-object flow formatting object.
- * This is an atomic inline object that contains
- * xml data.
+ * Class modelling the fo:instream-foreign-object object.
+ * This is an atomic inline object that contains XML data.
*/
public class InstreamForeignObject extends AbstractGraphics {
@@ -40,6 +40,8 @@
//Additional value
private Point2D intrinsicDimensions;
+ private Length intrinsicAlignmentAdjust;
+
/**
* constructs an instream-foreign-object object (called by Maker).
*
@@ -52,35 +54,35 @@
/**
* Make sure content model satisfied, if so then tell the
* FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
- if (childNodes == null || childNodes.size() != 1) {
+ if (firstChild == null) {
missingChildElementError("one (1) non-XSL namespace child");
}
getFOEventHandler().foreignObject(this);
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: one (1) non-XSL namespace child
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
invalidChildError(loc, nsURI, localName);
- } else if (childNodes != null) {
+ } else if (firstChild != null) {
tooManyNodesError(loc, "child element");
}
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "instream-foreign-object";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_INSTREAM_FOREIGN_OBJECT;
@@ -91,18 +93,19 @@
*/
private void prepareIntrinsicSize() {
if (intrinsicDimensions == null) {
- XMLObj child = (XMLObj)childNodes.get(0);
+ XMLObj child = (XMLObj) firstChild;
Point2D csize = new Point2D.Float(-1, -1);
intrinsicDimensions = child.getDimension(csize);
if (intrinsicDimensions == null) {
log.error("Intrinsic dimensions of "
+ " instream-foreign-object could not be determined");
}
+ intrinsicAlignmentAdjust = child.getIntrinsicAlignmentAdjust();
}
}
/**
- * @see org.apache.fop.fo.flow.AbstractGraphics#getIntrinsicWidth()
+ * {@inheritDoc}
*/
public int getIntrinsicWidth() {
prepareIntrinsicSize();
@@ -114,7 +117,7 @@
}
/**
- * @see org.apache.fop.fo.flow.AbstractGraphics#getIntrinsicHeight()
+ * {@inheritDoc}
*/
public int getIntrinsicHeight() {
prepareIntrinsicSize();
@@ -124,15 +127,24 @@
return 0;
}
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public Length getIntrinsicAlignmentAdjust()
+ {
+ prepareIntrinsicSize();
+ return intrinsicAlignmentAdjust;
+ }
- /** @see org.apache.fop.fo.FONode#addChildNode(org.apache.fop.fo.FONode) */
+ /** {@inheritDoc} */
protected void addChildNode(FONode child) throws FOPException {
super.addChildNode(child);
}
/** @return the XMLObj child node of the instream-foreign-object. */
public XMLObj getChildXMLObj() {
- return (XMLObj) childNodes.get(0);
+ return (XMLObj) firstChild;
}
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Leader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Leader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Leader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Leader.java Tue Sep 25 07:31:06 2007
@@ -23,10 +23,7 @@
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
-import org.apache.fop.fo.properties.SpaceProperty;
/**
* Class modelling fo:leader object.
@@ -53,9 +50,6 @@
// private CommonRelativePosition commonRelativePosition;
// private Length textDepth;
// private Length textAltitude;
- // private KeepProperty keepWithNext;
- // private KeepProperty keepWithPrevious;
- // private SpaceProperty wordSpacing;
// End of property values
/**
@@ -66,7 +60,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -171,13 +165,13 @@
return dominantBaseline;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "leader";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_LEADER;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListBlock.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListBlock.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListBlock.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListBlock.java Tue Sep 25 07:31:06 2007
@@ -27,11 +27,8 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonMarginBlock;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.KeepProperty;
/**
@@ -70,7 +67,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -87,7 +84,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -97,7 +94,7 @@
/**
* Make sure content model satisfied, if so then tell the
* FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
if (!hasListItem) {
@@ -107,7 +104,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* (list-item)+
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -176,12 +173,12 @@
return orphanContentLimit;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "list-block";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_LIST_BLOCK;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItem.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItem.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItem.java Tue Sep 25 07:31:06 2007
@@ -26,11 +26,8 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonMarginBlock;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.KeepProperty;
/**
@@ -64,7 +61,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -78,7 +75,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -86,9 +83,7 @@
}
/**
- * Make sure content model satisfied, if so then tell the
- * FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
if (label == null || body == null) {
@@ -98,7 +93,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* (list-item-label,list-item-body)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -123,7 +118,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#addChildNode(FONode)
+ * {@inheritDoc}
* @todo see if can/should rely on base class for this
* (i.e., add to childNodes instead)
*/
@@ -196,13 +191,13 @@
return body;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "list-item";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_LIST_ITEM;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItemBody.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItemBody.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItemBody.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItemBody.java Tue Sep 25 07:31:06 2007
@@ -35,7 +35,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -43,20 +43,20 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
super.endOfNode();
getFOEventHandler().endListBody();
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "list-item-body";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_LIST_ITEM_BODY;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItemLabel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItemLabel.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItemLabel.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/ListItemLabel.java Tue Sep 25 07:31:06 2007
@@ -35,7 +35,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -43,20 +43,20 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
super.endOfNode();
getFOEventHandler().endListLabel();
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "list-item-label";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_LIST_ITEM_LABEL;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Marker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Marker.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Marker.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Marker.java Tue Sep 25 07:31:06 2007
@@ -20,7 +20,6 @@
package org.apache.fop.fo.flow;
import java.util.Collections;
-import java.util.List;
import java.util.Map;
import org.xml.sax.Attributes;
@@ -37,7 +36,7 @@
import org.apache.fop.fo.properties.Property;
/**
- * Marker formatting object.
+ * Class modelling the fo:marker object.
*/
public class Marker extends FObjMixed {
// The value of properties relevant for fo:marker.
@@ -56,7 +55,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
if (findAncestor(FO_FLOW) < 0) {
@@ -82,7 +81,7 @@
descendantPropertyLists.get(foNode);
}
- /** @see org.apache.fop.fo.FONode#startOfNode() */
+ /** {@inheritDoc} */
protected void startOfNode() {
FOEventHandler foEventHandler = getFOEventHandler();
// Push a new property list maker which will make MarkerPropertyLists.
@@ -96,7 +95,7 @@
});
}
- /** @see org.apache.fop.fo.FONode#endOfNode() */
+ /** {@inheritDoc} */
protected void endOfNode() throws FOPException {
super.endOfNode();
// Pop the MarkerPropertyList maker.
@@ -105,7 +104,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: (#PCDATA|%inline;|%block;)*
* Additionally: "An fo:marker may contain any formatting objects that
* are permitted as a replacement of any fo:retrieve-marker that retrieves
@@ -130,19 +129,19 @@
return markerClassName;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "marker";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_MARKER;
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer(super.toString());
sb.append(" {").append(getMarkerClassName()).append("}");
@@ -203,7 +202,6 @@
/**
* Null implementation; not used by this type of PropertyList
- * @see org.apache.fop.fo.PropertyList#putExplicit(int, Property)
*/
public void putExplicit(int propId, Property value) {
//nop
@@ -211,14 +209,13 @@
/**
* Null implementation; not used by this type of PropertyList
- * @see org.apache.fop.fo.PropertyList#getExplicit(int)
*/
public Property getExplicit(int propId) {
return null;
}
/**
- * @see org.xml.sax.Attributes#getLength()
+ * {@inheritDoc}
*/
public int getLength() {
if (attribs == null) {
@@ -229,7 +226,7 @@
}
/**
- * @see org.xml.sax.Attributes#getURI(int)
+ * {@inheritDoc}
*/
public String getURI(int index) {
if (attribs != null
@@ -243,7 +240,7 @@
}
/**
- * @see org.xml.sax.Attributes#getLocalName(int)
+ * {@inheritDoc}
*/
public String getLocalName(int index) {
if (attribs != null
@@ -257,7 +254,7 @@
}
/**
- * @see org.xml.sax.Attributes#getQName(int)
+ * {@inheritDoc}
*/
public String getQName(int index) {
if (attribs != null
@@ -272,14 +269,13 @@
/**
* Default implementation; not used
- * @see org.xml.sax.Attributes#getType(int)
*/
public String getType(int index) {
return "CDATA";
}
/**
- * @see org.xml.sax.Attributes#getValue(int)
+ * {@inheritDoc}
*/
public String getValue(int index) {
if (attribs != null
@@ -293,7 +289,7 @@
}
/**
- * @see org.xml.sax.Attributes#getIndex(String, String)
+ * {@inheritDoc}
*/
public int getIndex(String name, String namespace) {
int index = -1;
@@ -310,7 +306,7 @@
}
/**
- * @see org.xml.sax.Attributes#getIndex(String)
+ * {@inheritDoc}
*/
public int getIndex(String qname) {
int index = -1;
@@ -327,7 +323,6 @@
/**
* Default implementation; not used
- * @see org.xml.sax.Attributes#getType(String, String)
*/
public String getType(String name, String namespace) {
return "CDATA";
@@ -335,14 +330,13 @@
/**
* Default implementation; not used
- * @see org.xml.sax.Attributes#getType(String)
*/
public String getType(String qname) {
return "CDATA";
}
/**
- * @see org.xml.sax.Attributes#getValue(String, String)
+ * {@inheritDoc}
*/
public String getValue(String name, String namespace) {
int index = getIndex(name, namespace);
@@ -353,7 +347,7 @@
}
/**
- * @see org.xml.sax.Attributes#getValue(String)
+ * {@inheritDoc}
*/
public String getValue(String qname) {
int index = getIndex(qname);
@@ -415,7 +409,7 @@
}
/**
- * @see java.lang.Object#equals(Object)
+ * {@inheritDoc}
*/
public boolean equals(Object o) {
if (o instanceof MarkerAttribute) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiCase.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiCase.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiCase.java Tue Sep 25 07:31:06 2007
@@ -23,7 +23,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
* Class modelling the fo:multi-case object.
@@ -31,7 +30,6 @@
*/
public class MultiCase extends FObj {
// The value of properties relevant for fo:multi-case.
- private String id;
private int startingState;
// private ToBeImplementedProperty caseName;
// private ToBeImplementedProperty caseTitle;
@@ -54,7 +52,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -70,13 +68,13 @@
return startingState;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "multi-case";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_MULTI_CASE;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiProperties.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiProperties.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiProperties.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiProperties.java Tue Sep 25 07:31:06 2007
@@ -26,7 +26,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
* Class modelling the fo:multi-properties object.
@@ -56,9 +55,7 @@
}
/**
- * Make sure content model satisfied, if so then tell the
- * FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
if (!hasMultiPropertySet || !hasWrapper) {
@@ -67,7 +64,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: (multi-property-set+, wrapper)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -89,13 +86,13 @@
}
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "multi-properties";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_MULTI_PROPERTIES;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiPropertySet.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiPropertySet.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiPropertySet.java Tue Sep 25 07:31:06 2007
@@ -51,7 +51,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -59,7 +59,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -67,13 +67,13 @@
invalidChildError(loc, nsURI, localName);
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "multi-property-set";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_MULTI_PROPERTY_SET;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiSwitch.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiSwitch.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiSwitch.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiSwitch.java Tue Sep 25 07:31:06 2007
@@ -27,11 +27,9 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
* Class modelling the fo:multi-switch object.
- * @todo needs implementation
*/
public class MultiSwitch extends FObj {
// The value of properties relevant for fo:multi-switch.
@@ -55,7 +53,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -64,17 +62,16 @@
/**
- * Make sure content model satisfied.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
- if (childNodes == null) {
+ if (firstChild == null) {
missingChildElementError("(multi-case+)");
}
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: (multi-case+)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -84,13 +81,13 @@
}
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "multi-switch";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_MULTI_SWITCH;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiToggle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiToggle.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiToggle.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/MultiToggle.java Tue Sep 25 07:31:06 2007
@@ -27,7 +27,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
@@ -54,7 +53,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
// prSwitchTo = pList.get(PR_SWITCH_TO);
@@ -62,7 +61,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: (#PCDATA|%inline;|%block;)*
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -72,13 +71,13 @@
}
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "multi-toggle";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_MULTI_TOGGLE;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumber.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumber.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumber.java Tue Sep 25 07:31:06 2007
@@ -30,14 +30,9 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonFont;
-import org.apache.fop.fo.properties.CommonMarginInline;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.CommonTextDecoration;
-import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.SpaceProperty;
/**
@@ -83,7 +78,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -103,7 +98,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -111,14 +106,14 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
getFOEventHandler().endPageNumber(this);
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -181,12 +176,12 @@
return lineHeight;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "page-number";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_PAGE_NUMBER;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumberCitation.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumberCitation.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumberCitation.java Tue Sep 25 07:31:06 2007
@@ -30,14 +30,9 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonFont;
-import org.apache.fop.fo.properties.CommonMarginInline;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.CommonTextDecoration;
-import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.SpaceProperty;
/**
@@ -87,7 +82,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -108,7 +103,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -118,7 +113,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -186,12 +181,12 @@
return refId;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "page-number-citation";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_PAGE_NUMBER_CITATION;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java Tue Sep 25 07:31:06 2007
@@ -38,12 +38,12 @@
super(parent);
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "page-number-citation-last";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_PAGE_NUMBER_CITATION_LAST;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/RetrieveMarker.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/RetrieveMarker.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/RetrieveMarker.java Tue Sep 25 07:31:06 2007
@@ -31,7 +31,7 @@
import org.xml.sax.Locator;
/**
- * The retrieve-marker formatting object.
+ * Class modelling the fo:retrieve-marker object.
* This will create a layout manager that will retrieve
* a marker based on the information.
*/
@@ -54,7 +54,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
if (findAncestor(FO_STATIC_CONTENT) < 0) {
@@ -75,7 +75,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -174,9 +174,9 @@
private void cloneFromMarker(Marker marker)
throws FOPException {
// clean up remnants from a possible earlier layout
- if (childNodes != null) {
+ if (firstChild != null) {
currentTextNode = null;
- childNodes.removeAll(childNodes);
+ firstChild = null;
}
cloneSubtree(marker.getChildNodes(), this,
marker, propertyList);
@@ -203,13 +203,13 @@
return;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "retrieve-marker";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_RETRIEVE_MARKER;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Table.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Table.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Table.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Table.java Tue Sep 25 07:31:06 2007
@@ -32,11 +32,8 @@
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.StaticPropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonMarginBlock;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthPairProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
@@ -72,8 +69,6 @@
private Length widowContentLimit;
private Length orphanContentLimit;
- private static final int MINCOLWIDTH = 10000; // 10pt
-
/** collection of columns in this table */
protected List columns = null;
@@ -106,7 +101,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -139,8 +134,7 @@
}
if (!isSeparateBorderModel()
&& getCommonBorderPaddingBackground().hasPadding(
- ValidationPercentBaseContext
- .getPseudoContextForValidationPurposes())) {
+ ValidationPercentBaseContext.getPseudoContext())) {
//See "17.6.2 The collapsing border model" in CSS2
attributeWarning("In collapsing border model a table does not have padding"
+ " (see http://www.w3.org/TR/REC-CSS2/tables.html#collapsing-borders)"
@@ -156,7 +150,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -164,7 +158,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: (marker*,table-column*,table-header?,table-footer?,table-body+)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -213,7 +207,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
@@ -237,7 +231,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#addChildNode(FONode)
+ * {@inheritDoc}
*/
protected void addChildNode(FONode child) throws FOPException {
@@ -349,14 +343,6 @@
return columns;
}
- /**
- * @param index index of the table-body element.
- * @return the requested table-body element
- */
- public TableBody getBody(int index) {
- return (TableBody) childNodes.get(index);
- }
-
/** @return the body for the table-header. */
public TableBody getTableHeader() {
return tableHeader;
@@ -464,12 +450,12 @@
return orphanContentLimit;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "table";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_TABLE;
}
@@ -505,7 +491,7 @@
}
/**
- * @see org.apache.fop.fo.flow.TableFObj#flagColumnIndices(int, int)
+ * {@inheritDoc}
*/
protected void flagColumnIndices(int start, int end) {
for (int i = start; i < end; i++) {
@@ -518,7 +504,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#clone(FONode, boolean)
+ * {@inheritDoc}
*/
public FONode clone(FONode parent, boolean removeChildren)
throws FOPException {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableAndCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableAndCaption.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableAndCaption.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableAndCaption.java Tue Sep 25 07:31:06 2007
@@ -25,14 +25,7 @@
import org.apache.fop.apps.FOPException;
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.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
-import org.apache.fop.fo.properties.CommonMarginBlock;
-import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.fo.properties.KeepProperty;
/**
* Class modelling the fo:table-and-caption property.
@@ -77,7 +70,7 @@
/**
* Make sure content model satisfied, if so then tell the
* FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
if (!tableFound) {
@@ -86,7 +79,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* table-caption? table
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -117,13 +110,13 @@
}
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "table-and-caption";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_TABLE_AND_CAPTION;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org