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 [7/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/layoutmgr/KnuthBox.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthBox.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthBox.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthBox.java Tue Sep 25 07:31:06 2007
@@ -45,12 +45,12 @@
super(w, pos, bAux);
}
- /** @see org.apache.fop.layoutmgr.KnuthElement#isBox() */
+ /** {@inheritDoc} */
public boolean isBox() {
return true;
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer(64);
if (isAuxiliary()) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthElement.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthElement.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthElement.java Tue Sep 25 07:31:06 2007
@@ -74,7 +74,7 @@
throw new RuntimeException("Element is not a glue");
}
- /** @see org.apache.fop.layoutmgr.ListElement#isUnresolvedElement() */
+ /** {@inheritDoc} */
public boolean isUnresolvedElement() {
return false;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthGlue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthGlue.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthGlue.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthGlue.java Tue Sep 25 07:31:06 2007
@@ -74,7 +74,7 @@
adjustmentClass = iAdjClass;
}
- /** @see org.apache.fop.layoutmgr.KnuthElement#isGlue() */
+ /** {@inheritDoc} */
public boolean isGlue() {
return true;
}
@@ -94,7 +94,7 @@
return adjustmentClass;
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer(64);
if (isAuxiliary()) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java Tue Sep 25 07:31:06 2007
@@ -81,7 +81,7 @@
breakClass = iBreakClass;
}
- /** @see org.apache.fop.layoutmgr.KnuthElement#isPenalty() */
+ /** {@inheritDoc} */
public boolean isPenalty() {
return true;
}
@@ -106,7 +106,7 @@
return bFlagged;
}
- /** @see org.apache.fop.layoutmgr.KnuthElement#isForcedBreak() */
+ /** {@inheritDoc} */
public boolean isForcedBreak() {
return penalty == -KnuthElement.INFINITE;
}
@@ -127,7 +127,7 @@
this.breakClass = cl;
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer(64);
if (isAuxiliary()) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthPossPosIter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthPossPosIter.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthPossPosIter.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/KnuthPossPosIter.java Tue Sep 25 07:31:06 2007
@@ -47,7 +47,7 @@
// Check position < endPos
/**
- * @see org.apache.fop.layoutmgr.PositionIterator#checkNext()
+ * {@inheritDoc}
*/
protected boolean checkNext() {
if (iterCount > 0) {
@@ -59,7 +59,7 @@
}
/**
- * @see java.util.Iterator#next()
+ * {@inheritDoc}
*/
public Object next() {
--iterCount;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LayoutContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LayoutContext.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LayoutContext.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LayoutContext.java Tue Sep 25 07:31:06 2007
@@ -471,7 +471,7 @@
this.spaceAfter = spaceAfter;
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
return "Layout Context:" +
"\nStack Limit: \t" + (getStackLimit() == null ? "null" : getStackLimit().toString()) +
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java Tue Sep 25 07:31:06 2007
@@ -86,8 +86,6 @@
import org.apache.fop.layoutmgr.table.TableLayoutManager;
import org.apache.fop.util.CharUtilities;
-import org.apache.fop.fo.extensions.destination.Destination;
-
/**
* The default LayoutManager maker class
*/
@@ -144,7 +142,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManagerMaker#makeLayoutManagers(FONode, List)
+ * {@inheritDoc}
*/
public void makeLayoutManagers(FONode node, List lms) {
Maker maker = (Maker) makers.get(node.getClass());
@@ -162,7 +160,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManagerMaker#makeLayoutManager(FONode)
+ * {@inheritDoc}
*/
public LayoutManager makeLayoutManager(FONode node) {
List lms = new ArrayList();
@@ -185,7 +183,7 @@
}
/*
- * @see org.apache.fop.layoutmgr.LayoutManagerMaker#makeFlowLayoutManager(PageSequenceLayoutManager, Flow)
+ * {@inheritDoc}
*/
public FlowLayoutManager makeFlowLayoutManager(
PageSequenceLayoutManager pslm, Flow flow) {
@@ -193,7 +191,7 @@
}
/*
- * @see org.apache.fop.layoutmgr.LayoutManagerMaker#makeContentLayoutManager(PageSequenceLayoutManager, Title)
+ * {@inheritDoc}
*/
public ContentLayoutManager makeContentLayoutManager(PageSequenceLayoutManager pslm,
Title title) {
@@ -201,7 +199,7 @@
}
/*
- * @see org.apache.fop.layoutmgr.LayoutManagerMaker#makeStaticContentLayoutManager(PageSequenceLayoutManager, StaticContent, Region)
+ * {@inheritDoc}
*/
public StaticContentLayoutManager makeStaticContentLayoutManager(
PageSequenceLayoutManager pslm, StaticContent sc, SideRegion reg) {
@@ -209,7 +207,7 @@
}
/*
- * @see org.apache.fop.layoutmgr.LayoutManagerMaker#makeStaticContentLayoutManager(PageSequenceLayoutManager, StaticContent, Block)
+ * {@inheritDoc}
*/
public StaticContentLayoutManager makeStaticContentLayoutManager(
PageSequenceLayoutManager pslm, StaticContent sc, org.apache.fop.area.Block block) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LeafPosition.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LeafPosition.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LeafPosition.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LeafPosition.java Tue Sep 25 07:31:06 2007
@@ -36,7 +36,7 @@
return getLM() != null;
}
- /** @see java.lang.Object#toString()*/
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("LeafPos:").append(getIndex()).append("(");
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/NonLeafPosition.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/NonLeafPosition.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/NonLeafPosition.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/NonLeafPosition.java Tue Sep 25 07:31:06 2007
@@ -36,7 +36,7 @@
return (subPos != null ? subPos.generatesAreas() : false);
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("NonLeafPos:").append(getIndex()).append("(");
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PaddingElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PaddingElement.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PaddingElement.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PaddingElement.java Tue Sep 25 07:31:06 2007
@@ -43,7 +43,7 @@
super(position, condLength, side, isFirst, isLast, context);
}
- /** @see org.apache.fop.layoutmgr.UnresolvedListElementWithLength */
+ /** {@inheritDoc} */
public void notifyLayoutManager(MinOptMax effectiveLength) {
LayoutManager lm = getOriginatingLayoutManager();
if (lm instanceof ConditionalElementListener) {
@@ -55,7 +55,7 @@
}
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer("Padding[");
sb.append(super.toString());
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageBreaker.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageBreaker.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageBreaker.java Tue Sep 25 07:31:06 2007
@@ -63,24 +63,24 @@
pslm, pslm.getPageSequence().getMainFlow());
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker */
+ /** {@inheritDoc} */
protected void updateLayoutContext(LayoutContext context) {
int flowIPD = pslm.getCurrentPV().getCurrentSpan().getColumnWidth();
context.setRefIPD(flowIPD);
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker#getTopLevelLM() */
+ /** {@inheritDoc} */
protected LayoutManager getTopLevelLM() {
return pslm;
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker#getPageProvider() */
+ /** {@inheritDoc} */
protected PageProvider getPageProvider() {
return pslm.getPageProvider();
}
/**
- * @see org.apache.fop.layoutmgr.AbstractBreaker#getLayoutListener()
+ * {@inheritDoc}
*/
protected PageBreakingLayoutListener getLayoutListener() {
return new PageBreakingLayoutListener() {
@@ -105,7 +105,7 @@
};
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker */
+ /** {@inheritDoc} */
protected int handleSpanChange(LayoutContext childLC, int nextSequenceStartsOn) {
needColumnBalancing = false;
if (childLC.getNextSpan() != Constants.NOT_SET) {
@@ -120,7 +120,7 @@
return nextSequenceStartsOn;
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker */
+ /** {@inheritDoc} */
protected int getNextBlockList(LayoutContext childLC,
int nextSequenceStartsOn) {
if (!firstPart) {
@@ -137,7 +137,7 @@
return super.getNextBlockList(childLC, nextSequenceStartsOn);
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker */
+ /** {@inheritDoc} */
protected LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
LinkedList contentList = null;
@@ -412,7 +412,7 @@
firstPart = false;
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker#handleEmptyContent() */
+ /** {@inheritDoc} */
protected void handleEmptyContent() {
pslm.getCurrentPV().getPage().fakeNonEmpty();
}
@@ -455,7 +455,7 @@
return childFLM;
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker#observeElementList(java.util.List) */
+ /** {@inheritDoc} */
protected void observeElementList(List elementList) {
ElementListObserver.observe(elementList, "breaker",
((PageSequence)pslm.getFObj()).getId());
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java Tue Sep 25 07:31:06 2007
@@ -864,7 +864,7 @@
return topLevelLM.getFObj();
}
- /** @see org.apache.fop.layoutmgr.BreakingAlgorithm#getLineWidth(int) */
+ /** {@inheritDoc} */
protected int getLineWidth(int line) {
int bpd;
if (pageProvider != null) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageProvider.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageProvider.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageProvider.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageProvider.java Tue Sep 25 07:31:06 2007
@@ -195,9 +195,9 @@
/**
*
- * @param isBlank
- * @param index
- * @return
+ * @param isBlank true if the Page should be a blank one
+ * @param index the Page's index
+ * @return a Page instance
*/
protected Page getPage(boolean isBlank, int index) {
boolean isLastPage = (lastPageIndex >= 0) && (index == lastPageIndex);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -91,8 +91,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager
- * @return the LayoutManagerMaker object
+ * @return the LayoutManagerMaker object associated to the areaTreeHandler
*/
public LayoutManagerMaker getLayoutManagerMaker() {
return areaTreeHandler.getLayoutManagerMaker();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/Position.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/Position.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/Position.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/Position.java Tue Sep 25 07:31:06 2007
@@ -76,7 +76,7 @@
}
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("Position:").append(getIndex()).append("(");
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/RelSide.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/RelSide.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/RelSide.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/RelSide.java Tue Sep 25 07:31:06 2007
@@ -46,7 +46,7 @@
return this.name;
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
return "RelSide:" + name;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceElement.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceElement.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceElement.java Tue Sep 25 07:31:06 2007
@@ -65,7 +65,7 @@
return this.precedence;
}
- /** @see org.apache.fop.layoutmgr.UnresolvedListElementWithLength */
+ /** {@inheritDoc} */
public void notifyLayoutManager(MinOptMax effectiveLength) {
LayoutManager lm = getOriginatingLayoutManager();
if (lm instanceof ConditionalElementListener) {
@@ -77,7 +77,7 @@
}
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer("Space[");
sb.append(super.toString());
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceResolver.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceResolver.java Tue Sep 25 07:31:06 2007
@@ -544,7 +544,7 @@
}
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("SpaceHandlingBreakPosition(");
@@ -597,7 +597,7 @@
}
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("SpaceHandlingPosition");
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java Tue Sep 25 07:31:06 2007
@@ -46,7 +46,7 @@
}
/**
- * @see java.lang.Object#clone()
+ * {@inheritDoc}
*/
public Object clone() {
try {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -83,7 +83,7 @@
targetBlock = block;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
if (true) {
throw new UnsupportedOperationException(
@@ -176,7 +176,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addAreas(PositionIterator, LayoutContext)
+ * {@inheritDoc}
*/
public void addAreas(PositionIterator parentIter, LayoutContext layoutContext) {
AreaAdditionUtil.addAreas(this, parentIter, layoutContext);
@@ -190,7 +190,7 @@
* Add child area to a the correct container, depending on its
* area class. A Flow can fill at most one area container of any class
* at any one time. The actual work is done by BlockStackingLM.
- * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
+ * {@inheritDoc}
*/
public void addChildArea(Area childArea) {
if (getStaticContentFO().getFlowName().equals("xsl-footnote-separator")) {
@@ -201,7 +201,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getParentArea(Area)
+ * {@inheritDoc}
*/
public Area getParentArea(Area childArea) {
if (getStaticContentFO().getFlowName().equals("xsl-footnote-separator")) {
@@ -270,7 +270,7 @@
this.displayAlign = displayAlign;
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker#observeElementList(java.util.List) */
+ /** {@inheritDoc} */
protected void observeElementList(List elementList) {
String elementListID = getStaticContentFO().getFlowName();
String pageSequenceID = ((PageSequence)lm.getParent().getFObj()).getId();
@@ -280,7 +280,7 @@
ElementListObserver.observe(elementList, "static-content", elementListID);
}
- /** @see org.apache.fop.layoutmgr.AbstractBreaker#isPartOverflowRecoveryActivated() */
+ /** {@inheritDoc} */
protected boolean isPartOverflowRecoveryActivated() {
//For side regions, this must be disabled because of wanted overflow.
return false;
@@ -363,7 +363,7 @@
return contentAreaIPD;
}
- /** @see org.apache.fop.layoutmgr.BlockStackingLayoutManager#setContentAreaIPD(int) */
+ /** {@inheritDoc} */
protected void setContentAreaIPD(int contentAreaIPD) {
this.contentAreaIPD = contentAreaIPD;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java Tue Sep 25 07:31:06 2007
@@ -58,7 +58,7 @@
this.isLast = isLast;
}
- /** @see org.apache.fop.layoutmgr.UnresolvedListElement#isConditional() */
+ /** {@inheritDoc} */
public boolean isConditional() {
return this.conditional;
}
@@ -91,7 +91,7 @@
*/
public abstract void notifyLayoutManager(MinOptMax effectiveLength);
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append(getSide().getName()).append(", ");
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -231,7 +231,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(LayoutContext, int)
+ * {@inheritDoc}
*/
public LinkedList getNextKnuthElements(LayoutContext context,
int alignment) {
@@ -241,7 +241,7 @@
}
/**
- * @see LeafNodeLayoutManager#makeAlignmentContext(LayoutContext)
+ * {@inheritDoc}
*/
protected AlignmentContext makeAlignmentContext(LayoutContext context) {
return new AlignmentContext(
@@ -255,7 +255,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#addId()
+ * {@inheritDoc}
*/
protected void addId() {
getPSLM().addIDToPage(fobj.getId());
@@ -271,7 +271,7 @@
// --------- Property Resolution related functions --------- //
/**
- * @see org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, FObj)
+ * {@inheritDoc}
*/
public int getBaseLength(int lengthBase, FObj fobj) {
switch (lengthBase) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java Tue Sep 25 07:31:06 2007
@@ -511,7 +511,7 @@
return (getWritingMode() == EN_LR_TB || getWritingMode() == EN_RL_TB);
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer(64);
sb.append("ah=" + areaHeight);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -43,7 +43,7 @@
fobj = node;
}
- /** @see org.apache.fop.layoutmgr.inline.InlineLayoutManager#createArea(boolean) */
+ /** {@inheritDoc} */
protected InlineArea createArea(boolean bInlineParent) {
InlineArea area = super.createArea(bInlineParent);
setupBasicLinkArea(parentLM, area);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java Tue Sep 25 07:31:06 2007
@@ -173,7 +173,7 @@
}
/**
- * @see ScaledBaselineTable#setBeforeAndAfterBaselines(int, int)
+ * {@inheritDoc}
*/
public void setBeforeAndAfterBaselines(int beforeBaseline, int afterBaseline) {
beforeEdgeOffset = beforeBaseline;
@@ -181,7 +181,7 @@
}
/**
- * @see ScaledBaselineTable#deriveScaledBaselineTable(int)
+ * {@inheritDoc}
*/
public ScaledBaselineTable deriveScaledBaselineTable(int baselineIdentifier) {
BasicScaledBaselineTable bac
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -61,7 +61,7 @@
fobj = node;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#initialize */
+ /** {@inheritDoc} */
public void initialize() {
font = fobj.getCommonFont().getFontState(fobj.getFOEventHandler().getFontInfo(), this);
SpaceVal ls = SpaceVal.makeLetterSpacing(fobj.getLetterSpacing());
@@ -91,7 +91,7 @@
return text;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(LayoutContext, int) */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
MinOptMax ipd;
curArea = get(context);
@@ -152,13 +152,13 @@
return returnList;
}
- /** @see InlineLevelLayoutManager#getWordChars(StringBuffer, Position) */
+ /** {@inheritDoc} */
public void getWordChars(StringBuffer sbChars, Position bp) {
sbChars.append
(((org.apache.fop.area.inline.TextArea) curArea).getText());
}
- /** @see InlineLevelLayoutManager#hyphenate(Position, HyphContext) */
+ /** {@inheritDoc} */
public void hyphenate(Position pos, HyphContext hc) {
if (hc.getNextHyphPoint() == 1) {
// the character ends a syllable
@@ -172,7 +172,7 @@
hc.updateOffset(1);
}
- /** @see InlineLevelLayoutManager#applyChanges(List) */
+ /** {@inheritDoc} */
public boolean applyChanges(List oldList) {
setFinished(false);
if (isSomethingChanged) {
@@ -185,7 +185,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(List, int) */
+ /** {@inheritDoc} */
public LinkedList getChangedKnuthElements(List oldList, int alignment) {
if (isFinished()) {
return null;
@@ -235,7 +235,7 @@
return returnList;
}
- /** @see LeafNodeLayoutManager#addId */
+ /** {@inheritDoc} */
protected void addId() {
getPSLM().addIDToPage(fobj.getId());
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -173,60 +173,60 @@
return stackSize;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /** {@inheritDoc} */
public Area getParentArea(Area childArea) {
return holder;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
+ * {@inheritDoc}
**/
public void addChildArea(Area childArea) {
holder.addChildArea(childArea);
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#setParent(LayoutManager)
+ * {@inheritDoc}
*/
public void setParent(LayoutManager lm) {
parentLM = lm;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#getParent() */
+ /** {@inheritDoc} */
public LayoutManager getParent() {
return this.parentLM;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#isFinished()
+ * {@inheritDoc}
*/
public boolean isFinished() {
return false;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#setFinished(boolean)
+ * {@inheritDoc}
*/
public void setFinished(boolean isFinished) {
//to be done
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#resetPosition(Position)
+ * {@inheritDoc}
*/
public void resetPosition(Position position) {
//to be done
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#createNextChildLMs(int)
+ * {@inheritDoc}
*/
public boolean createNextChildLMs(int pos) {
return false;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getChildLMs()
+ * {@inheritDoc}
*/
public List getChildLMs() {
List childLMs = new ArrayList(1);
@@ -235,7 +235,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addChildLM
+ * {@inheritDoc}
*/
public void addChildLM(LayoutManager lm) {
if (lm == null) {
@@ -248,7 +248,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addChildLMs
+ * {@inheritDoc}
*/
public void addChildLMs(List newLMs) {
if (newLMs == null || newLMs.size() == 0) {
@@ -348,28 +348,28 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getGeneratesReferenceArea
+ * {@inheritDoc}
*/
public boolean getGeneratesReferenceArea() {
return false;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getGeneratesBlockArea
+ * {@inheritDoc}
*/
public boolean getGeneratesBlockArea() {
return getGeneratesLineArea() || holder instanceof Block;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getGeneratesLineArea
+ * {@inheritDoc}
*/
public boolean getGeneratesLineArea() {
return holder instanceof LineArea;
}
/* (non-Javadoc)
- * @see org.apache.fop.layoutmgr.LayoutManager#notifyPos(org.apache.fop.layoutmgr.Position)
+ * {@inheritDoc}
*/
public Position notifyPos(Position pos) {
return pos;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -61,7 +61,7 @@
footnote = node;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#initialize() */
+ /** {@inheritDoc} */
public void initialize() {
// create an InlineStackingLM handling the fo:inline child of fo:footnote
citationLM = new InlineLayoutManager(footnote.getFootnoteCitation());
@@ -70,7 +70,7 @@
bodyLM = new FootnoteBodyLayoutManager(footnote.getFootnoteBody());
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context,
int alignment) {
// for the moment, this LM is set as the citationLM's parent
@@ -120,7 +120,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(java.util.List, int)
+ * {@inheritDoc}
*/
public LinkedList getChangedKnuthElements(List oldList,
int alignment) {
@@ -131,7 +131,7 @@
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addAreas(PositionIterator posIter, LayoutContext context);
+ * {@inheritDoc}
*/
public void addAreas(PositionIterator posIter, LayoutContext context) {
// "Unwrap" the NonLeafPositions stored in posIter and put
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -30,6 +30,7 @@
import org.apache.fop.area.inline.InlineBlockParent;
import org.apache.fop.area.inline.InlineParent;
import org.apache.fop.datatypes.Length;
+import org.apache.fop.fo.Constants;
import org.apache.fop.fo.flow.Inline;
import org.apache.fop.fo.flow.InlineLevel;
import org.apache.fop.fo.flow.Leader;
@@ -106,7 +107,7 @@
return (Inline)fobj;
}
- /** @see LayoutManager#initialize */
+ /** {@inheritDoc} */
public void initialize() {
int padding = 0;
font = fobj.getCommonFont().getFontState(fobj.getFOEventHandler().getFontInfo(), this);
@@ -136,7 +137,7 @@
}
- /** @see InlineStackingLayoutManager#getExtraIPD(boolean, boolean) */
+ /** {@inheritDoc} */
protected MinOptMax getExtraIPD(boolean isNotFirst, boolean isNotLast) {
int borderAndPadding = 0;
if (borderProps != null) {
@@ -153,7 +154,7 @@
}
- /** @see InlineStackingLayoutManager#hasLeadingFence(boolean) */
+ /** {@inheritDoc} */
protected boolean hasLeadingFence(boolean isNotFirst) {
return borderProps != null
&& (borderProps.getPadding(CommonBorderPaddingBackground.START, isNotFirst, this) > 0
@@ -161,7 +162,7 @@
);
}
- /** @see InlineStackingLayoutManager#hasTrailingFence(boolean) */
+ /** {@inheritDoc} */
protected boolean hasTrailingFence(boolean isNotLast) {
return borderProps != null
&& (borderProps.getPadding(CommonBorderPaddingBackground.END, isNotLast, this) > 0
@@ -169,16 +170,21 @@
);
}
- /** @see InlineStackingLayoutManager#getSpaceStart */
+ /** {@inheritDoc} */
protected SpaceProperty getSpaceStart() {
return inlineProps != null ? inlineProps.spaceStart : null;
}
- /** @see InlineStackingLayoutManager#getSpaceEnd */
+ /** {@inheritDoc} */
protected SpaceProperty getSpaceEnd() {
return inlineProps != null ? inlineProps.spaceEnd : null;
}
- /** @see org.apache.fop.layoutmgr.inline.InlineLayoutManager#createArea(boolean) */
+ /**
+ * Create and initialize an <code>InlineArea</code>
+ *
+ * @param hasInlineParent true if the parent is an inline
+ * @return the area
+ */
protected InlineArea createArea(boolean hasInlineParent) {
InlineArea area;
if (hasInlineParent) {
@@ -193,9 +199,7 @@
return area;
}
- /**
- * @see org.apache.fop.layoutmgr.inline.InlineStackingLayoutManager#setTraits(boolean, boolean)
- */
+ /** {@inheritDoc} */
protected void setTraits(boolean isNotFirst, boolean isNotLast) {
if (borderProps != null) {
// Add border and padding to current area and set flags (FIRST, LAST ...)
@@ -208,7 +212,6 @@
/**
* @return true if this element must be kept together
*/
- // TODO Use the keep-together property on Inline as well
public boolean mustKeepTogether() {
return mustKeepTogether(this.getParent());
}
@@ -223,7 +226,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
LayoutManager curLM;
@@ -288,6 +291,7 @@
}
while ((curLM = (LayoutManager) getChildLM()) != null) {
+
if (!(curLM instanceof InlineLevelLayoutManager)) {
// A block LM
// Leave room for start/end border and padding
@@ -299,19 +303,19 @@
- borderProps.getBorderEndWidth(hasNextChildLM()));
}
}
+
// get KnuthElements from curLM
returnedList = curLM.getNextKnuthElements(childLC, alignment);
if (returnList.size() == 0 && childLC.isKeepWithPreviousPending()) {
childLC.setFlags(LayoutContext.KEEP_WITH_PREVIOUS_PENDING, false);
}
- if (returnedList == null) {
- // curLM returned null because it finished;
+ if (returnedList == null
+ || returnedList.size() == 0) {
+ // curLM returned null or an empty list, because it finished;
// just iterate once more to see if there is another child
continue;
}
- if (returnedList.size() == 0) {
- continue;
- }
+
if (curLM instanceof InlineLevelLayoutManager) {
context.setFlags(LayoutContext.KEEP_WITH_NEXT_PENDING, false);
// "wrap" the Position stored in each element of returnedList
@@ -483,7 +487,7 @@
areaCreated = true;
}
- /** @see LayoutManager#addChildArea(Area) */
+ /** {@inheritDoc} */
public void addChildArea(Area childArea) {
Area parent = getCurrentArea();
if (getContext().resolveLeadingSpace()) {
@@ -494,7 +498,7 @@
parent.addChildArea(childArea);
}
- /** @see LayoutManager#getChangedKnuthElements(List, int) */
+ /** {@inheritDoc} */
public LinkedList getChangedKnuthElements(List oldList, int alignment) {
LinkedList returnedList = new LinkedList();
addKnuthElementsForBorderPaddingStart(returnedList);
@@ -544,7 +548,7 @@
return this.auxiliaryPosition;
}
- /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#addId() */
+ /** {@inheritDoc} */
protected void addId() {
if (fobj instanceof Inline) {
getPSLM().addIDToPage(getInlineFO().getId());
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -281,7 +281,7 @@
}
}
- /** @see InlineLevelLayoutManager#addALetterSpaceTo(List) */
+ /** {@inheritDoc} */
public List addALetterSpaceTo(List oldList) {
// old list contains only a box, or the sequence: box penalty glue box
@@ -331,21 +331,21 @@
}
- /** @see InlineLevelLayoutManager#getWordChars(StringBuffer, Position) */
+ /** {@inheritDoc} */
public void getWordChars(StringBuffer sbChars, Position pos) {
Position newPos = ((NonLeafPosition) pos).getPosition();
((InlineLevelLayoutManager)
newPos.getLM()).getWordChars(sbChars, newPos);
}
- /** @see InlineLevelLayoutManager#hyphenate(Position, HyphContext) */
+ /** {@inheritDoc} */
public void hyphenate(Position pos, HyphContext hc) {
Position newPos = ((NonLeafPosition) pos).getPosition();
((InlineLevelLayoutManager)
newPos.getLM()).hyphenate(newPos, hc);
}
- /** @see InlineLevelLayoutManager#applyChanges(List) */
+ /** {@inheritDoc} */
public boolean applyChanges(List oldList) {
// "unwrap" the Positions stored in the elements
ListIterator oldListIterator = oldList.listIterator();
@@ -411,7 +411,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(List, int)
+ * {@inheritDoc}
*/
public LinkedList getChangedKnuthElements(List oldList, int alignment) {
// "unwrap" the Positions stored in the elements
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java Tue Sep 25 07:31:06 2007
@@ -71,7 +71,7 @@
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer(super.toString());
return sb.toString();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -65,7 +65,7 @@
fobj = node;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#initialize */
+ /** {@inheritDoc} */
public void initialize() {
font = fobj.getCommonFont().getFontState(fobj.getFOEventHandler().getFontInfo(), this);
// the property leader-alignment does not affect vertical positioning
@@ -193,7 +193,7 @@
return leaderArea;
}
- /** @see LeafNodeLayoutManager#addAreas(PositionIterator, LayoutContext) */
+ /** {@inheritDoc} */
public void addAreas(PositionIterator posIter, LayoutContext context) {
if (fobj.getLeaderPattern() != EN_USECONTENT) {
// use LeafNodeLayoutManager.addAreas()
@@ -223,7 +223,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(LayoutContext, int) */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context,
int alignment) {
MinOptMax ipd;
@@ -286,19 +286,19 @@
return returnList;
}
- /** @see InlineLevelLayoutManager#hyphenate(Position, HyphContext) */
+ /** {@inheritDoc} */
public void hyphenate(Position pos, HyphContext hc) {
// use the AbstractLayoutManager.hyphenate() null implementation
super.hyphenate(pos, hc);
}
- /** @see InlineLevelLayoutManager#applyChanges(List) */
+ /** {@inheritDoc} */
public boolean applyChanges(List oldList) {
setFinished(false);
return false;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(List, int) */
+ /** {@inheritDoc} */
public LinkedList getChangedKnuthElements(List oldList,
int alignment) {
if (isFinished()) {
@@ -335,13 +335,13 @@
return returnList;
}
- /** @see LeafNodeLayoutManager#addId */
+ /** {@inheritDoc} */
protected void addId() {
getPSLM().addIDToPage(fobj.getId());
}
/**
- * @see org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, FObj)
+ * {@inheritDoc}
*/
public int getBaseLength(int lengthBase, FObj fobj) {
return getParent().getBaseLength(lengthBase, getParent().getFObj());
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -258,7 +258,7 @@
area.setAdjustment(width - areaInfo.ipdArea.opt);
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(LayoutContext, int) */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
curArea = get(context);
@@ -292,7 +292,7 @@
return returnList;
}
- /** @see InlineLevelLayoutManager#addALetterSpaceTo(List) */
+ /** {@inheritDoc} */
public List addALetterSpaceTo(List oldList) {
// return the unchanged elements
return oldList;
@@ -308,21 +308,21 @@
log.warn(this.getClass().getName() + " should not receive a call to removeWordSpace(list)");
}
- /** @see InlineLevelLayoutManager#getWordChars(StringBuffer, Position) */
+ /** {@inheritDoc} */
public void getWordChars(StringBuffer sbChars, Position pos) {
}
- /** @see InlineLevelLayoutManager#hyphenate(Position, HyphContext) */
+ /** {@inheritDoc} */
public void hyphenate(Position pos, HyphContext hc) {
}
- /** @see InlineLevelLayoutManager#applyChanges(List) */
+ /** {@inheritDoc} */
public boolean applyChanges(List oldList) {
setFinished(false);
return false;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(List, int) */
+ /** {@inheritDoc} */
public LinkedList getChangedKnuthElements(List oldList,
int alignment) {
if (isFinished()) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -84,7 +84,7 @@
private Block fobj;
private boolean isFirstInBlock;
- /** @see org.apache.fop.layoutmgr.LayoutManager#initialize() */
+ /** {@inheritDoc} */
public void initialize() {
textAlignment = fobj.getTextAlign();
textAlignmentLast = fobj.getTextAlignLast();
@@ -452,7 +452,7 @@
follow = f;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
this.context = context;
Font fs = fobj.getCommonFont().getFontState(fobj.getFOEventHandler().getFontInfo(), this);
@@ -473,8 +473,6 @@
knuthParagraphs = new ArrayList();
// here starts Knuth's algorithm
- //TODO availIPD should not really be used here, so we can later support custom line
- //widths for for each line (side-floats, differing available IPD after page break)
collectInlineKnuthElements();
} else {
// this method has been called before
@@ -562,7 +560,6 @@
/**
* Phase 1 of Knuth algorithm: Collect all inline Knuth elements before determining line breaks.
* @param context the LayoutContext
- * @param availIPD available IPD for line (should be removed!)
*/
private void collectInlineKnuthElements() {
LayoutContext inlineLC = new LayoutContext(context);
@@ -571,7 +568,7 @@
LinkedList returnedList = null;
// TODO this is the same as availIPD.opt
iLineWidth = context.getStackLimit().opt;
-
+
// convert all the text in a sequence of paragraphs made
// of KnuthBox, KnuthGlue and KnuthPenalty objects
boolean bPrevWasKnuthBox = false;
@@ -582,14 +579,11 @@
while ((curLM = (InlineLevelLayoutManager) getChildLM()) != null) {
returnedList = curLM.getNextKnuthElements(inlineLC, effectiveAlignment);
- if (returnedList == null) {
- // curLM returned null; this can happen
- // if it has nothing more to layout,
- // so just iterate once more to see
- // if there are other children
- continue;
- }
- if (returnedList.size() == 0) {
+ if (returnedList == null
+ || returnedList.size() == 0) {
+ /* curLM.getNextKnuthElements() returned null or an empty list;
+ * this can happen if there is nothing more to layout,
+ * so just iterate once more to see if there are other children */
continue;
}
@@ -1064,28 +1058,28 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepTogether
+ * {@inheritDoc}
*/
public boolean mustKeepTogether() {
return ((BlockLevelLayoutManager) getParent()).mustKeepTogether();
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithPrevious
+ * {@inheritDoc}
*/
public boolean mustKeepWithPrevious() {
return false;
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithNext
+ * {@inheritDoc}
*/
public boolean mustKeepWithNext() {
return false;
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#negotiateBPDAdjustment(int, org.apache.fop.layoutmgr.KnuthElement)
+ * {@inheritDoc}
*/
public int negotiateBPDAdjustment(int adj, KnuthElement lastElement) {
LeafPosition pos = (LeafPosition)lastElement.getPosition();
@@ -1104,13 +1098,13 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#discardSpace(KnuthGlue)
+ * {@inheritDoc}
*/
public void discardSpace(KnuthGlue spaceGlue) {
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(List, int)
+ * {@inheritDoc}
*/
public LinkedList getChangedKnuthElements(List oldList, int alignment) {
LinkedList returnList = new LinkedList();
@@ -1600,7 +1594,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
+ * {@inheritDoc}
*/
public void addChildArea(Area childArea) {
// Make sure childArea is inline area
@@ -1618,14 +1612,14 @@
// --------- Property Resolution related functions --------- //
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getGeneratesBlockArea
+ * {@inheritDoc}
*/
public boolean getGeneratesBlockArea() {
return true;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getGeneratesLineArea
+ * {@inheritDoc}
*/
public boolean getGeneratesLineArea() {
return true;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -46,7 +46,7 @@
fobj = node;
}
- /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#get(LayoutContext) */
+ /** {@inheritDoc} */
public InlineArea get(LayoutContext context) {
curArea = getPageNumberCitationLastInlineArea(parentLM);
return curArea;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -55,14 +55,14 @@
fobj = node;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#initialize */
+ /** {@inheritDoc} */
public void initialize() {
font = fobj.getCommonFont().getFontState(fobj.getFOEventHandler().getFontInfo(), this);
setCommonBorderPaddingBackground(fobj.getCommonBorderPaddingBackground());
}
/**
- * @see LeafNodeLayoutManager#makeAlignmentContext(LayoutContext)
+ * {@inheritDoc}
*/
protected AlignmentContext makeAlignmentContext(LayoutContext context) {
return new AlignmentContext(
@@ -76,14 +76,14 @@
);
}
- /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#get(LayoutContext) */
+ /** {@inheritDoc} */
public InlineArea get(LayoutContext context) {
curArea = getPageNumberCitationInlineArea(parentLM);
return curArea;
}
/**
- * @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#addAreas(PositionIterator
+ * {@inheritDoc}
* , LayoutContext)
*/
public void addAreas(PositionIterator posIter, LayoutContext context) {
@@ -145,7 +145,7 @@
return width;
}
- /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#addId() */
+ /** {@inheritDoc} */
protected void addId() {
getPSLM().addIDToPage(fobj.getId());
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -47,14 +47,14 @@
fobj = node;
}
- /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#get(LayoutContext) */
+ /** {@inheritDoc} */
public void initialize() {
font = fobj.getCommonFont().getFontState(fobj.getFOEventHandler().getFontInfo(), this);
setCommonBorderPaddingBackground(fobj.getCommonBorderPaddingBackground());
}
/**
- * @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager
+ * {@inheritDoc}
* #makeAlignmentContext(LayoutContext)
*/
protected AlignmentContext makeAlignmentContext(LayoutContext context) {
@@ -69,7 +69,7 @@
);
}
- /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#get(LayoutContext) */
+ /** {@inheritDoc} */
public InlineArea get(LayoutContext context) {
// get page string from parent, build area
TextArea text = new TextArea();
@@ -87,7 +87,7 @@
return text;
}
- /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#getEffectiveArea() */
+ /** {@inheritDoc} */
protected InlineArea getEffectiveArea() {
TextArea baseArea = (TextArea)curArea;
//TODO Maybe replace that with a clone() call or better, a copy constructor
@@ -127,7 +127,7 @@
return width;
}
- /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#addId() */
+ /** {@inheritDoc} */
protected void addId() {
getPSLM().addIDToPage(fobj.getId());
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -30,7 +30,6 @@
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.FOText;
-import org.apache.fop.fo.flow.Inline;
import org.apache.fop.fonts.Font;
import org.apache.fop.layoutmgr.InlineKnuthSequence;
import org.apache.fop.layoutmgr.KnuthBox;
@@ -165,6 +164,8 @@
private int lineStartBAP = 0;
private int lineEndBAP = 0;
+
+ private boolean keepTogether;
/**
* Create a Text layout manager.
@@ -183,7 +184,7 @@
vecAreaInfo = new java.util.ArrayList();
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#initialize */
+ /** {@inheritDoc} */
public void initialize() {
font = foText.getCommonFont().getFontState(foText.getFOEventHandler().getFontInfo(), this);
@@ -214,11 +215,9 @@
// in the SpaceVal.makeWordSpacing() method
letterSpaceIPD = ls.getSpace();
wordSpaceIPD = MinOptMax.add(new MinOptMax(spaceCharIPD), ws.getSpace());
+
+ keepTogether = foText.getKeepTogether().getWithinLine().getEnum() == Constants.EN_ALWAYS;
- // if the text node is son of an inline, set vertical align
- if (foText.getParent() instanceof Inline) {
- Inline fobj = (Inline)foText.getParent();
- }
}
/**
@@ -543,15 +542,11 @@
*/
private static boolean isSpace(final char ch) {
return ch == CharUtilities.SPACE
- || ch == CharUtilities.NBSPACE
+ || CharUtilities.isNonBreakableSpace(ch)
|| CharUtilities.isFixedWidthSpace(ch);
}
- private static boolean isBreakChar(final char ch) {
- return (BREAK_CHARS.indexOf(ch) >= 0);
- }
-
- /** @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(LayoutContext, int) */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
lineStartBAP = context.getLineStartBorderAndPaddingWidth();
lineEndBAP = context.getLineEndBorderAndPaddingWidth();
@@ -571,7 +566,7 @@
while (iNextStart < textArray.length) {
ch = textArray[iNextStart];
boolean breakOpportunity = false;
- byte breakAction = lbs.nextChar(ch);
+ byte breakAction = keepTogether? LineBreakStatus.PROHIBITED_BREAK : lbs.nextChar(ch);
switch (breakAction) {
case LineBreakStatus.COMBINING_PROHIBITED_BREAK:
case LineBreakStatus.PROHIBITED_BREAK:
@@ -689,14 +684,16 @@
}
}
- if (ch == CharUtilities.SPACE && foText.getWhitespaceTreatment() == Constants.EN_PRESERVE || ch == CharUtilities.NBSPACE) {
+ if ((ch == CharUtilities.SPACE
+ && foText.getWhitespaceTreatment() == Constants.EN_PRESERVE)
+ || ch == CharUtilities.NBSPACE) {
// preserved space or non-breaking space:
// create the AreaInfo object
ai = new AreaInfo(iNextStart, (short) (iNextStart + 1),
(short) 1, (short) 0,
wordSpaceIPD, false, true, breakOpportunity);
iThisStart = (short) (iNextStart + 1);
- } else if (CharUtilities.isFixedWidthSpace(ch)) {
+ } else if (CharUtilities.isFixedWidthSpace(ch) || CharUtilities.isZeroWidthSpace(ch)) {
// create the AreaInfo object
MinOptMax ipd = new MinOptMax(font.getCharWidth(ch));
ai = new AreaInfo(iNextStart, (short) (iNextStart + 1),
@@ -799,7 +796,7 @@
}
}
- /** @see InlineLevelLayoutManager#addALetterSpaceTo(List) */
+ /** {@inheritDoc} */
public List addALetterSpaceTo(List oldList) {
// old list contains only a box, or the sequence: box penalty glue box;
// look at the Position stored in the first element in oldList
@@ -865,7 +862,7 @@
}
}
- /** @see InlineLevelLayoutManager#hyphenate(Position, HyphContext) */
+ /** {@inheritDoc} */
public void hyphenate(Position pos, HyphContext hc) {
AreaInfo ai
= (AreaInfo) vecAreaInfo.get(((LeafPosition) pos).getLeafPos());
@@ -943,7 +940,7 @@
}
}
- /** @see InlineLevelLayoutManager#applyChanges(List) */
+ /** {@inheritDoc} */
public boolean applyChanges(List oldList) {
setFinished(false);
@@ -975,7 +972,7 @@
return bChanged;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(List, int) */
+ /** {@inheritDoc} */
public LinkedList getChangedKnuthElements(List oldList,
int alignment) {
if (isFinished()) {
@@ -1002,7 +999,7 @@
return returnList;
}
- /** @see InlineLevelLayoutManager#getWordChars(StringBuffer, Position) */
+ /** {@inheritDoc} */
public void getWordChars(StringBuffer sbChars, Position pos) {
int iLeafValue = ((LeafPosition) pos).getLeafPos();
if (iLeafValue != -1) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -41,7 +41,7 @@
fobj = node;
}
- /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager */
+ /** {@inheritDoc} */
public InlineArea get(LayoutContext context) {
// Create a zero-width, zero-height dummy area so this node can
// participate in the ID handling. Otherwise, addId() wouldn't
@@ -75,7 +75,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#addId() */
+ /** {@inheritDoc} */
protected void addId() {
getPSLM().addIDToPage(fobj.getId());
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -94,7 +94,7 @@
return (ListBlock)fobj;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#initialize() */
+ /** {@inheritDoc} */
public void initialize() {
foSpaceBefore = new SpaceVal(
getListBlockFO().getCommonMarginBlock().spaceBefore, this).getSpace();
@@ -113,7 +113,7 @@
this.effSpaceAfter = null;
}
- /** @see org.apache.fop.layoutmgr.BlockStackingLayoutManager */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
resetSpaces();
LinkedList returnList = super.getNextKnuthElements(context, alignment);
@@ -133,7 +133,7 @@
return returnList;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(java.util.List, int) */
+ /** {@inheritDoc} */
public LinkedList getChangedKnuthElements(List oldList, int alignment) {
//log.debug("LBLM.getChangedKnuthElements>");
return super.getChangedKnuthElements(oldList, alignment);
@@ -294,7 +294,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepTogether() */
+ /** {@inheritDoc} */
public boolean mustKeepTogether() {
//TODO Keeps will have to be more sophisticated sooner or later
return ((BlockLevelLayoutManager)getParent()).mustKeepTogether()
@@ -302,19 +302,19 @@
|| !getListBlockFO().getKeepTogether().getWithinColumn().isAuto();
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithPrevious() */
+ /** {@inheritDoc} */
public boolean mustKeepWithPrevious() {
return !getListBlockFO().getKeepWithPrevious().getWithinPage().isAuto()
|| !getListBlockFO().getKeepWithPrevious().getWithinColumn().isAuto();
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithNext() */
+ /** {@inheritDoc} */
public boolean mustKeepWithNext() {
return !getListBlockFO().getKeepWithNext().getWithinPage().isAuto()
|| !getListBlockFO().getKeepWithNext().getWithinColumn().isAuto();
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifySpace(RelSide side, MinOptMax effectiveLength) {
if (RelSide.BEFORE == side) {
if (log.isDebugEnabled()) {
@@ -331,7 +331,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifyBorder(RelSide side, MinOptMax effectiveLength) {
if (effectiveLength == null) {
if (RelSide.BEFORE == side) {
@@ -345,7 +345,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifyPadding(RelSide side, MinOptMax effectiveLength) {
if (effectiveLength == null) {
if (RelSide.BEFORE == side) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -97,7 +97,7 @@
xoffset = off;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(java.util.List, int) */
+ /** {@inheritDoc} */
public LinkedList getChangedKnuthElements(List oldList, int alignment) {
//log.debug(" ListItemContentLayoutManager.getChanged>");
return super.getChangedKnuthElements(oldList, alignment);
@@ -238,7 +238,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepTogether() */
+ /** {@inheritDoc} */
public boolean mustKeepTogether() {
//TODO Keeps will have to be more sophisticated sooner or later
return ((BlockLevelLayoutManager)getParent()).mustKeepTogether()
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -115,7 +115,7 @@
return iBodyLastIndex;
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer("ListItemPosition:");
sb.append(getIndex()).append("(");
@@ -162,7 +162,7 @@
body.setParent(this);
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#initialize() */
+ /** {@inheritDoc} */
public void initialize() {
foSpaceBefore = new SpaceVal(
getListItemFO().getCommonMarginBlock().spaceBefore, this).getSpace();
@@ -181,7 +181,7 @@
this.effSpaceAfter = null;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /** {@inheritDoc} */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
referenceIPD = context.getRefIPD();
LayoutContext childLC;
@@ -402,7 +402,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getChangedKnuthElements(java.util.List, int)
+ * {@inheritDoc}
*/
public LinkedList getChangedKnuthElements(List oldList, int alignment) {
//log.debug(" LILM.getChanged> label");
@@ -638,7 +638,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepTogether() */
+ /** {@inheritDoc} */
public boolean mustKeepTogether() {
//TODO Keeps will have to be more sophisticated sooner or later
return ((BlockLevelLayoutManager)getParent()).mustKeepTogether()
@@ -646,19 +646,19 @@
|| !getListItemFO().getKeepTogether().getWithinColumn().isAuto();
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithPrevious() */
+ /** {@inheritDoc} */
public boolean mustKeepWithPrevious() {
return !getListItemFO().getKeepWithPrevious().getWithinPage().isAuto()
|| !getListItemFO().getKeepWithPrevious().getWithinColumn().isAuto();
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithNext() */
+ /** {@inheritDoc} */
public boolean mustKeepWithNext() {
return !getListItemFO().getKeepWithNext().getWithinPage().isAuto()
|| !getListItemFO().getKeepWithNext().getWithinColumn().isAuto();
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifySpace(RelSide side, MinOptMax effectiveLength) {
if (RelSide.BEFORE == side) {
if (log.isDebugEnabled()) {
@@ -675,7 +675,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifyBorder(RelSide side, MinOptMax effectiveLength) {
if (effectiveLength == null) {
if (RelSide.BEFORE == side) {
@@ -689,7 +689,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifyPadding(RelSide side, MinOptMax effectiveLength) {
if (effectiveLength == null) {
if (RelSide.BEFORE == side) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java Tue Sep 25 07:31:06 2007
@@ -120,7 +120,7 @@
}
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
return columns.toString();
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/EffRow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/EffRow.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/EffRow.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/EffRow.java Tue Sep 25 07:31:06 2007
@@ -157,7 +157,7 @@
}
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer("EffRow {");
sb.append(index);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java Tue Sep 25 07:31:06 2007
@@ -44,17 +44,17 @@
this.body = body;
}
- /** @see org.apache.fop.layoutmgr.table.GridUnit#isPrimary() */
+ /** {@inheritDoc} */
public boolean isPrimary() {
return true;
}
- /** @see org.apache.fop.layoutmgr.table.GridUnit#getBody() */
+ /** {@inheritDoc} */
public TableBody getBody() {
return this.body;
}
- /** @see org.apache.fop.layoutmgr.table.GridUnit#getRow() */
+ /** {@inheritDoc} */
public TableRow getRow() {
return this.row;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/GridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/GridUnit.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/GridUnit.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/GridUnit.java Tue Sep 25 07:31:06 2007
@@ -334,7 +334,7 @@
}
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer buffer = new StringBuffer();
if (isEmpty()) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/GridUnitPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/GridUnitPart.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/GridUnitPart.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/GridUnitPart.java Tue Sep 25 07:31:06 2007
@@ -53,13 +53,18 @@
return (end >= 0 && end == pgu.getElements().size() - 1);
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer("Part: ");
sb.append(start).append("-").append(end);
sb.append(" [").append(isFirstPart() ? "F" : "-").append(isLastPart() ? "L" : "-");
sb.append("] ").append(pgu);
return sb.toString();
+ }
+
+ boolean mustKeepWithPrevious() {
+ return pgu.getFlag(GridUnit.KEEP_WITH_PREVIOUS_PENDING)
+ || (pgu.getRow() != null && pgu.getRow().mustKeepWithPrevious());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org