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 [8/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/table/PrimaryGridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java Tue Sep 25 07:31:06 2007
@@ -212,7 +212,7 @@
return widths;
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer(super.toString());
sb.append(" startRow=").append(startRow);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/RowPainter.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/RowPainter.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/RowPainter.java Tue Sep 25 07:31:06 2007
@@ -28,6 +28,7 @@
import org.apache.fop.fo.flow.TableRow;
import org.apache.fop.fo.properties.LengthRangeProperty;
import org.apache.fop.layoutmgr.ElementListUtils;
+import org.apache.fop.layoutmgr.KnuthElement;
import org.apache.fop.layoutmgr.KnuthPossPosIter;
import org.apache.fop.layoutmgr.LayoutContext;
import org.apache.fop.layoutmgr.SpaceResolver;
@@ -91,11 +92,6 @@
return this.accumulatedBPD;
}
- public void notifyNestedPenaltyArea(int length) {
- yoffset += length;
- accumulatedBPD += length;
- }
-
/**
* Records the fragment of row represented by the given position. If it belongs to
* another (grid) row than the current one, that latter is painted and flushed first.
@@ -233,8 +229,18 @@
log.trace("getting len for " + columnIndex + " "
+ start + "-" + end);
}
+ int actualStart = start;
+ // Skip from the content length calculation glues and penalties occuring at the
+ // beginning of the page
+ while (actualStart <= end && !((KnuthElement)pgu.getElements().get(actualStart)).isBox()) {
+ actualStart++;
+ }
int len = ElementListUtils.calcContentLength(
- pgu.getElements(), start, end);
+ pgu.getElements(), actualStart, end);
+ KnuthElement el = (KnuthElement)pgu.getElements().get(end);
+ if (el.isPenalty()) {
+ len += el.getW();
+ }
partBPD[columnIndex] = len;
if (log.isTraceEnabled()) {
log.trace("len of part: " + len);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -94,7 +94,7 @@
return getTable().isSeparateBorderModel();
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#initialize() */
+ /** {@inheritDoc} */
public void initialize() {
borderAndPaddingBPD = 0;
borderAndPaddingBPD += getTableCell()
@@ -122,7 +122,7 @@
}
- /** @see org.apache.fop.layoutmgr.BlockStackingLayoutManager#getIPIndents() */
+ /** {@inheritDoc} */
protected int getIPIndents() {
int iIndents = 0;
int[] startEndBorderWidths = primaryGridUnit.getStartEndBorderWidths();
@@ -139,7 +139,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager
+ * {@inheritDoc}
*/
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
MinOptMax stackLimit = new MinOptMax(context.getStackLimit());
@@ -517,7 +517,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager
+ * {@inheritDoc}
*/
public int negotiateBPDAdjustment(int adj, KnuthElement lastElement) {
// TODO Auto-generated method stub
@@ -525,14 +525,14 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager
+ * {@inheritDoc}
*/
public void discardSpace(KnuthGlue spaceGlue) {
// TODO Auto-generated method stub
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepTogether()
+ * {@inheritDoc}
*/
public boolean mustKeepTogether() {
//TODO Keeps will have to be more sophisticated sooner or later
@@ -544,7 +544,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithPrevious()
+ * {@inheritDoc}
*/
public boolean mustKeepWithPrevious() {
return false; //TODO FIX ME
@@ -555,7 +555,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithNext()
+ * {@inheritDoc}
*/
public boolean mustKeepWithNext() {
return false; //TODO FIX ME
@@ -589,14 +589,14 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getGeneratesReferenceArea
+ * {@inheritDoc}
*/
public boolean getGeneratesReferenceArea() {
return true;
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#getGeneratesBlockArea
+ * {@inheritDoc}
*/
public boolean getGeneratesBlockArea() {
return true;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -133,7 +133,7 @@
return this.footerList;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager */
+ /** @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(LayoutContext, int) */
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
log.debug("==> Columns: " + getTableLM().getColumns());
KnuthBox headerAsFirst = null;
@@ -625,7 +625,6 @@
List positions = new java.util.ArrayList();
List headerElements = null;
List footerElements = null;
- int nestedPenaltyArea = 0;
Position firstPos = null;
Position lastPos = null;
Position lastCheckPos = null;
@@ -675,7 +674,6 @@
if (penaltyPos.footerElements != null) {
footerElements = penaltyPos.footerElements;
}
- nestedPenaltyArea = penaltyPos.nestedPenaltyLength;
}
Map markers = getTableLM().getTable().getMarkers();
@@ -695,7 +693,6 @@
Iterator posIter = positions.iterator();
iterateAndPaintPositions(posIter, painter);
- painter.notifyNestedPenaltyArea(nestedPenaltyArea);
if (footerElements != null) {
//Positions for footers are simply added at the end
PositionIterator nestedIter = new KnuthPossPosIter(footerElements);
@@ -828,7 +825,7 @@
// --------- Property Resolution related functions --------- //
/**
- * @see org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, FObj)
+ * {@inheritDoc}
*/
public int getBaseLength(int lengthBase, FObj fobj) {
return tableLM.getBaseLength(lengthBase, fobj);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableHFPenaltyPosition.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableHFPenaltyPosition.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableHFPenaltyPosition.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableHFPenaltyPosition.java Tue Sep 25 07:31:06 2007
@@ -34,8 +34,6 @@
protected List headerElements;
/** Element list for the footer */
protected List footerElements;
- /** Penalty length to be respected for nested content */
- protected int nestedPenaltyLength;
/**
* Creates a new TableHFPenaltyPosition
@@ -52,8 +50,6 @@
sb.append(headerElements);
sb.append(", footer:");
sb.append(footerElements);
- sb.append(", inner penalty length:");
- sb.append(nestedPenaltyLength);
sb.append(")");
return sb.toString();
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java Tue Sep 25 07:31:06 2007
@@ -100,7 +100,7 @@
return this.columns;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#initialize() */
+ /** {@inheritDoc} */
public void initialize() {
foSpaceBefore = new SpaceVal(
getTable().getCommonMarginBlock().spaceBefore, this).getSpace();
@@ -415,20 +415,20 @@
}
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager */
+ /** {@inheritDoc} */
public int negotiateBPDAdjustment(int adj, KnuthElement lastElement) {
// TODO Auto-generated method stub
return 0;
}
- /** @see org.apache.fop.layoutmgr.BlockLevelLayoutManager */
+ /** {@inheritDoc} */
public void discardSpace(KnuthGlue spaceGlue) {
// TODO Auto-generated method stub
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepTogether()
+ * {@inheritDoc}
*/
public boolean mustKeepTogether() {
//TODO Keeps will have to be more sophisticated sooner or later
@@ -438,7 +438,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithPrevious()
+ * {@inheritDoc}
*/
public boolean mustKeepWithPrevious() {
return !getTable().getKeepWithPrevious().getWithinPage().isAuto()
@@ -446,7 +446,7 @@
}
/**
- * @see org.apache.fop.layoutmgr.BlockLevelLayoutManager#mustKeepWithNext()
+ * {@inheritDoc}
*/
public boolean mustKeepWithNext() {
return !getTable().getKeepWithNext().getWithinPage().isAuto()
@@ -456,7 +456,7 @@
// --------- Property Resolution related functions --------- //
/**
- * @see org.apache.fop.datatypes.PercentBaseContext#getBaseLength(int, FObj)
+ * {@inheritDoc}
*/
public int getBaseLength(int lengthBase, FObj fobj) {
// Special handler for TableColumn width specifications
@@ -480,7 +480,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifySpace(RelSide side, MinOptMax effectiveLength) {
if (RelSide.BEFORE == side) {
if (log.isDebugEnabled()) {
@@ -497,7 +497,7 @@
}
}
- /** @see org.apache.fop.layoutmgr.ConditionalElementListener */
+ /** {@inheritDoc} */
public void notifyBorder(RelSide side, MinOptMax effectiveLength) {
if (effectiveLength == null) {
if (RelSide.BEFORE == side) {
@@ -511,7 +511,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/TableStepper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableStepper.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableStepper.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableStepper.java Tue Sep 25 07:31:06 2007
@@ -29,174 +29,17 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.flow.TableRow;
import org.apache.fop.layoutmgr.BreakElement;
-import org.apache.fop.layoutmgr.ElementListUtils;
import org.apache.fop.layoutmgr.KnuthBox;
-import org.apache.fop.layoutmgr.KnuthElement;
+import org.apache.fop.layoutmgr.KnuthGlue;
import org.apache.fop.layoutmgr.KnuthPenalty;
import org.apache.fop.layoutmgr.LayoutContext;
+import org.apache.fop.layoutmgr.Position;
/**
* This class processes row groups to create combined element lists for tables.
*/
public class TableStepper {
- private static class ActiveCell {
- private PrimaryGridUnit pgu;
- /** Knuth elements for this active cell. */
- private List elementList;
- /** Number of the row where the row-span begins, zero-based. */
- private int startRow;
- /** Index, in the list of Knuth elements, of the element starting the current step. */
- private int start;
- /** Index, in the list of Knuth elements, of the element ending the current step. */
- private int end;
- /**
- * Total length of the Knuth elements already included in the steps, up to the
- * current one.
- */
- private int width;
- private int backupWidth;
- private int baseWidth;
- private int borderBefore;
- private int borderAfter;
- private int paddingBefore;
- private int paddingAfter;
- private boolean keepWithNextSignal;
- private int lastPenaltyLength;
-
- ActiveCell(PrimaryGridUnit pgu, EffRow row, int rowIndex, EffRow[] rowGroup, TableLayoutManager tableLM) {
- this.pgu = pgu;
- boolean makeBoxForWholeRow = false;
- if (row.getExplicitHeight().min > 0) {
- boolean contentsSmaller = ElementListUtils.removeLegalBreaks(
- pgu.getElements(), row.getExplicitHeight());
- if (contentsSmaller) {
- makeBoxForWholeRow = true;
- }
- }
- if (pgu.isLastGridUnitRowSpan() && pgu.getRow() != null) {
- makeBoxForWholeRow |= pgu.getRow().mustKeepTogether();
- makeBoxForWholeRow |= pgu.getTable().mustKeepTogether();
- }
- if (makeBoxForWholeRow) {
- elementList = new java.util.ArrayList(1);
- int height = row.getExplicitHeight().opt;
- if (height == 0) {
- height = row.getHeight().opt;
- }
- elementList.add(new KnuthBoxCellWithBPD(height));
- } else {
- //Copy elements (LinkedList) to array lists to improve
- //element access performance
- elementList = new java.util.ArrayList(pgu.getElements());
-// if (log.isTraceEnabled()) {
-// log.trace("column " + (column+1) + ": recording " + elementLists.size() + " element(s)");
-// }
- }
- if (pgu.getTable().isSeparateBorderModel()) {
- borderBefore = pgu.getBorders().getBorderBeforeWidth(false) + tableLM.getHalfBorderSeparationBPD();
- borderAfter = pgu.getBorders().getBorderAfterWidth(false) + tableLM.getHalfBorderSeparationBPD();
- } else {
- borderBefore = pgu.getHalfMaxBeforeBorderWidth();
- borderAfter = pgu.getHalfMaxAfterBorderWidth();
- }
- paddingBefore = pgu.getBorders().getPaddingBefore(false, pgu.getCellLM());
- paddingAfter = pgu.getBorders().getPaddingAfter(false, pgu.getCellLM());
- start = 0;
- end = -1;
- width = 0;
- startRow = rowIndex;
- keepWithNextSignal = false;
- computeBaseWidth(rowGroup);
- }
-
- private void computeBaseWidth(EffRow[] rowGroup) {
- baseWidth = 0;
- for (int prevRow = 0; prevRow < startRow; prevRow++) {
- baseWidth += rowGroup[prevRow].getHeight().opt;
- }
- }
-
- private boolean endsOnRow(int rowIndex) {
- return rowIndex == startRow + pgu.getCell().getNumberRowsSpanned() - 1;
- }
-
- int getRemainingHeight(int activeRowIndex, EffRow[] rowGroup) {
- if (end == elementList.size() - 1) {
- return 0;
- }
- if (!endsOnRow(activeRowIndex)) {
- return 0;
- }
- int len = width;
- if (len > 0) {
- len += borderBefore + borderAfter;
- len += paddingBefore + paddingAfter;
- }
- int nominalHeight = 0;
- for (int r = startRow; r < startRow + pgu.getCell().getNumberRowsSpanned(); r++) {
- nominalHeight += rowGroup[r].getHeight().opt;
- }
- return nominalHeight - len;
- }
-
- void backupWidth() {
- backupWidth = width;
- }
-
- int getNextStep() {
- lastPenaltyLength = 0;
- while (end + 1 < elementList.size()) {
- end++;
- KnuthElement el = (KnuthElement)elementList.get(end);
- if (el.isPenalty()) {
- if (el.getP() < KnuthElement.INFINITE) {
- //First legal break point
- lastPenaltyLength = el.getW();
- break;
- }
- } else if (el.isGlue()) {
- if (end > 0) {
- KnuthElement prev = (KnuthElement)elementList.get(end - 1);
- if (prev.isBox()) {
- //Second legal break point
- break;
- }
- }
- width += el.getW();
- } else {
- width += el.getW();
- }
- }
- if (end < start) {
-// if (log.isTraceEnabled()) {
-// log.trace("column " + (i + 1) + ": (end=" + end + ") < (start=" + start
-// + ") => resetting width to backupWidth");
-// }
- width = backupWidth;
- return 0;
- } else {
- return baseWidth + width + borderBefore + borderAfter + paddingBefore
- + paddingAfter;
- }
- }
-
- boolean signalMinStep(int minStep) {
- int len = baseWidth + width + borderBefore + borderAfter + paddingBefore + paddingAfter;
- if (len > minStep) {
- width = backupWidth;
- end = start - 1;
- return baseWidth + borderBefore + borderAfter + paddingBefore
- + paddingAfter + width > minStep;
- } else {
- return false;
- }
- }
-
- int getLastPenaltyLength() {
- return lastPenaltyLength;
- }
- }
/** Logger **/
private static Log log = LogFactory.getLog(TableStepper.class);
@@ -206,10 +49,10 @@
/** Number of columns in the row group. */
private int columnCount;
private int totalHeight;
+ private int previousRowsLength = 0;
private int activeRowIndex;
private boolean rowBacktrackForLastStep;
private boolean skippedStep;
- private int lastMaxPenaltyLength;
private List activeCells = new LinkedList();
@@ -245,7 +88,7 @@
*
* @param column column number of the grid unit to get
* @return the corresponding grid unit (may be null)
- * @see TableStepper#getActiveRow
+ * {@inheritDoc}
*/
private GridUnit getActiveGridUnit(int column) {
return getActiveRow().safelyGetGridUnit(column);
@@ -265,8 +108,8 @@
int maxW = 0;
if (!rowBacktrackForLastStep) {
for (Iterator iter = activeCells.iterator(); iter.hasNext();) {
- maxW = Math.max(maxW, ((ActiveCell) iter.next()).getRemainingHeight(activeRowIndex,
- rowGroup));
+ maxW = Math.max(maxW,
+ ((ActiveCell) iter.next()).getRemainingHeight(activeRowIndex));
}
}
for (int i = activeRowIndex + (rowBacktrackForLastStep ? 0 : 1); i < rowGroup.length; i++) {
@@ -276,22 +119,18 @@
return maxW;
}
- private void setupElementList(int column) {
- GridUnit gu = getActiveGridUnit(column);
- EffRow row = getActiveRow();
- if (gu != null && !gu.isEmpty() && gu.isPrimary()) {
- activeCells.add(new ActiveCell((PrimaryGridUnit) gu, row, activeRowIndex, rowGroup, getTableLM()));
- }
- }
-
/**
* Initializes the informations relative to the Knuth elements, to handle a new row in
* the current row group.
*/
private void initializeElementLists() {
log.trace("Entering initializeElementLists()");
+ EffRow row = getActiveRow();
for (int i = 0; i < columnCount; i++) {
- setupElementList(i);
+ GridUnit gu = getActiveGridUnit(i);
+ if (gu != null && !gu.isEmpty() && gu.isPrimary()) {
+ activeCells.add(new ActiveCell((PrimaryGridUnit) gu, row, activeRowIndex, previousRowsLength, getTableLM()));
+ }
}
}
@@ -320,8 +159,8 @@
while ((step = getNextStep()) >= 0) {
int normalRow = activeRowIndex;
int increase = step - laststep;
- int penaltyLen = step + getMaxRemainingHeight() - totalHeight;
- int boxLen = step - addedBoxLen - penaltyLen;
+ int penaltyOrGlueLen = step + getMaxRemainingHeight() - totalHeight;
+ int boxLen = step - addedBoxLen - Math.max(0, penaltyOrGlueLen);
addedBoxLen += boxLen;
boolean forcedBreak = false;
@@ -330,51 +169,21 @@
List gridUnitParts = new java.util.ArrayList(maxColumnCount);
for (Iterator iter = activeCells.iterator(); iter.hasNext();) {
ActiveCell activeCell = (ActiveCell) iter.next();
- if (activeCell.end >= activeCell.start) {
- PrimaryGridUnit pgu = activeCell.pgu;
- if (activeCell.start == 0 && activeCell.end == 0
- && activeCell.elementList.size() == 1
- && activeCell.elementList.get(0) instanceof KnuthBoxCellWithBPD) {
- //Special case: Cell with fixed BPD
- gridUnitParts.add(new GridUnitPart(pgu,
- 0, pgu.getElements().size() - 1));
- } else {
- gridUnitParts.add(new GridUnitPart(pgu, activeCell.start, activeCell.end));
- if (((KnuthElement)activeCell.elementList.get(activeCell.end)).isForcedBreak()) {
- forcedBreak = true;
- breakClass = ((KnuthPenalty)activeCell.elementList.get(activeCell.end)).getBreakClass();
- }
- }
- if (activeCell.end + 1 == activeCell.elementList.size()) {
- if (pgu.getFlag(GridUnit.KEEP_WITH_NEXT_PENDING)) {
- log.debug("PGU has pending keep-with-next");
- activeCell.keepWithNextSignal = true;
- }
- if (pgu.getRow() != null && pgu.getRow().mustKeepWithNext()) {
- log.debug("table-row causes keep-with-next");
- activeCell.keepWithNextSignal = true;
- }
+ if (activeCell.contributesContent()) {
+ GridUnitPart gup = activeCell.createGridUnitPart();
+ gridUnitParts.add(gup);
+ forcedBreak = activeCell.isLastForcedBreak();
+ if (forcedBreak) {
+ breakClass = activeCell.getLastBreakClass();
}
- if (activeCell.start == 0 && activeCell.end >= 0) {
- if (pgu.getFlag(GridUnit.KEEP_WITH_PREVIOUS_PENDING)) {
- log.debug("PGU has pending keep-with-previous");
- if (returnList.size() == 0) {
- context.setFlags(LayoutContext.KEEP_WITH_PREVIOUS_PENDING);
- }
- }
- if (pgu.getRow() != null && pgu.getRow().mustKeepWithPrevious()) {
- log.debug("table-row causes keep-with-previous");
- if (returnList.size() == 0) {
- context.setFlags(LayoutContext.KEEP_WITH_PREVIOUS_PENDING);
- }
- }
+ if (returnList.size() == 0 && gup.isFirstPart() && gup.mustKeepWithPrevious()) {
+ context.setFlags(LayoutContext.KEEP_WITH_PREVIOUS_PENDING);
}
}
}
//log.debug(">>> guPARTS: " + gridUnitParts);
//Create elements for step
- int effPenaltyLen = penaltyLen;
TableContentPosition tcpos = new TableContentPosition(getTableLM(),
gridUnitParts, rowGroup[normalRow]);
if (returnList.size() == 0) {
@@ -386,6 +195,8 @@
+ " - row=" + activeRowIndex + " - " + tcpos);
}
returnList.add(new KnuthBox(boxLen, tcpos, false));
+
+ int effPenaltyLen = Math.max(0, penaltyOrGlueLen);
TableHFPenaltyPosition penaltyPos = new TableHFPenaltyPosition(getTableLM());
if (bodyType == TableRowIterator.BODY) {
if (!getTableLM().getTable().omitHeaderAtBreak()) {
@@ -398,26 +209,13 @@
}
}
- //Handle a penalty length coming from nested content
- //Example: nested table with header/footer
- if (this.lastMaxPenaltyLength != 0) {
- penaltyPos.nestedPenaltyLength = this.lastMaxPenaltyLength;
- if (log.isDebugEnabled()) {
- log.debug("Additional penalty length from table-cell break: "
- + this.lastMaxPenaltyLength);
- }
- }
- effPenaltyLen += this.lastMaxPenaltyLength;
-
int p = 0;
boolean allCellsHaveContributed = true;
signalKeepWithNext = false;
for (Iterator iter = activeCells.iterator(); iter.hasNext();) {
ActiveCell activeCell = (ActiveCell) iter.next();
- if (activeCell.start == 0 && activeCell.end < 0 && activeCell.elementList != null) {
- allCellsHaveContributed = false;
- }
- signalKeepWithNext |= activeCell.keepWithNextSignal;
+ allCellsHaveContributed &= activeCell.hasStarted();
+ signalKeepWithNext |= activeCell.keepWithNextSignal();
}
if (!allCellsHaveContributed) {
//Not all cells have contributed to a newly started row. The penalty here is
@@ -441,11 +239,14 @@
p = -KnuthPenalty.INFINITE; //Overrides any keeps (see 4.8 in XSL 1.0)
}
returnList.add(new BreakElement(penaltyPos, effPenaltyLen, p, breakClass, context));
+ if (penaltyOrGlueLen < 0) {
+ returnList.add(new KnuthGlue(-penaltyOrGlueLen, 0, 0, new Position(null), true));
+ }
if (log.isDebugEnabled()) {
log.debug("step=" + step + " (+" + increase + ")"
+ " box=" + boxLen
- + " penalty=" + penaltyLen
+ + " penalty=" + penaltyOrGlueLen
+ " effPenalty=" + effPenaltyLen);
}
@@ -469,17 +270,12 @@
*/
private int getNextStep() {
log.trace("Entering getNextStep");
- this.lastMaxPenaltyLength = 0;
//Check for forced break conditions
/*
if (isBreakCondition()) {
return -1;
}*/
- for (Iterator iter = activeCells.iterator(); iter.hasNext();) {
- ((ActiveCell) iter.next()).backupWidth();
- }
-
//set starting points
goToNextRowIfCurrentFinished();
@@ -493,8 +289,6 @@
if (nextStep > 0) {
stepFound = true;
minStep = Math.min(minStep, nextStep);
- lastMaxPenaltyLength = Math.max(lastMaxPenaltyLength, activeCell
- .getLastPenaltyLength());
}
}
if (!stepFound) {
@@ -536,20 +330,12 @@
private void goToNextRowIfCurrentFinished() {
// We assume that the current grid row is finished. If this is not the case this
- // boolean will be reset (see below)
+ // boolean will be reset
boolean currentGridRowFinished = true;
for (Iterator iter = activeCells.iterator(); iter.hasNext();) {
ActiveCell activeCell = (ActiveCell) iter.next();
- if (activeCell.end < activeCell.elementList.size()) {
- activeCell.start = activeCell.end + 1;
- if (activeCell.end + 1 < activeCell.elementList.size()
- && activeCell.endsOnRow(activeRowIndex)) {
- // Ok, so this grid unit is the last in the row-spanning direction and
- // there are still unhandled Knuth elements. They /will/ have to be
- // put on the current grid row, which means that this row isn't
- // finished yet
- currentGridRowFinished = false;
- }
+ if (activeCell.endsOnRow(activeRowIndex)) {
+ currentGridRowFinished &= activeCell.isFinished();
}
}
@@ -562,6 +348,7 @@
"break-after ignored on table-row because of row spanning "
+ "in progress (See XSL 1.0, 7.19.1)", rowFO));
}
+ previousRowsLength += rowGroup[activeRowIndex].getHeight().opt;
activeRowIndex++;
if (log.isDebugEnabled()) {
log.debug("===> new row: " + activeRowIndex);
@@ -581,15 +368,4 @@
private TableLayoutManager getTableLM() {
return this.tclm.getTableLM();
}
-
- /**
- * Marker class denoting table cells fitting in just one box (no legal break inside).
- */
- private static class KnuthBoxCellWithBPD extends KnuthBox {
-
- public KnuthBoxCellWithBPD(int w) {
- super(w, null, true);
- }
- }
-
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/ASCII85Filter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/ASCII85Filter.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/ASCII85Filter.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/ASCII85Filter.java Tue Sep 25 07:31:06 2007
@@ -41,7 +41,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFFilter#isASCIIFilter()
+ * {@inheritDoc}
*/
public boolean isASCIIFilter() {
return true;
@@ -57,7 +57,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
+ * {@inheritDoc}
*/
public OutputStream applyFilter(OutputStream out) throws IOException {
return new ASCII85OutputStream(out);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/ASCIIHexFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/ASCIIHexFilter.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/ASCIIHexFilter.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/ASCIIHexFilter.java Tue Sep 25 07:31:06 2007
@@ -40,7 +40,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFFilter#isASCIIFilter()
+ * {@inheritDoc}
*/
public boolean isASCIIFilter() {
return true;
@@ -56,7 +56,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
+ * {@inheritDoc}
*/
public OutputStream applyFilter(OutputStream out) throws IOException {
return new ASCIIHexOutputStream(out);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/AbstractPDFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/AbstractPDFStream.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/AbstractPDFStream.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/AbstractPDFStream.java Tue Sep 25 07:31:06 2007
@@ -164,7 +164,7 @@
/**
* Overload the base object method so we don't have to copy
* byte arrays around so much
- * @see org.apache.fop.pdf.PDFObject#output(OutputStream)
+ * {@inheritDoc}
*/
protected int output(OutputStream stream) throws IOException {
int length = 0;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/BitmapImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/BitmapImage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/BitmapImage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/BitmapImage.java Tue Sep 25 07:31:06 2007
@@ -173,13 +173,13 @@
return maskRef;
}
- /** @see org.apache.fop.pdf.PDFImage#isInverted() */
+ /** {@inheritDoc} */
public boolean isInverted() {
return false;
}
/**
- * @see org.apache.fop.pdf.PDFImage#outputContents(OutputStream)
+ * {@inheritDoc}
*/
public void outputContents(OutputStream out) throws IOException {
out.write(bitmaps);
@@ -202,14 +202,14 @@
}
/**
- * @see org.apache.fop.pdf.PDFImage#getFilterHint()
+ * {@inheritDoc}
*/
public String getFilterHint() {
return PDFFilterList.IMAGE_FILTER;
}
/**
- * @see org.apache.fop.pdf.PDFImage#getPDFFilter()
+ * {@inheritDoc}
*/
public PDFFilter getPDFFilter() {
return null;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/CCFFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/CCFFilter.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/CCFFilter.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/CCFFilter.java Tue Sep 25 07:31:06 2007
@@ -31,14 +31,14 @@
private String decodeParms;
/**
- * @see org.apache.fop.pdf.PDFFilter#getName()
+ * {@inheritDoc}
*/
public String getName() {
return "/CCITTFaxDecode";
}
/**
- * @see org.apache.fop.pdf.PDFFilter#getDecodeParms()
+ * {@inheritDoc}
*/
public String getDecodeParms() {
return this.decodeParms;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/FlateFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/FlateFilter.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/FlateFilter.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/FlateFilter.java Tue Sep 25 07:31:06 2007
@@ -211,7 +211,7 @@
/**
- * @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
+ * {@inheritDoc}
*/
public OutputStream applyFilter(OutputStream out) throws IOException {
return new FlateEncodeOutputStream(out);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/InMemoryStreamCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/InMemoryStreamCache.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/InMemoryStreamCache.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/InMemoryStreamCache.java Tue Sep 25 07:31:06 2007
@@ -67,7 +67,7 @@
}
/**
- * @see org.apache.fop.pdf.StreamCache#write(byte[])
+ * {@inheritDoc}
*/
public void write(byte[] data) throws IOException {
getOutputStream().write(data);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/NullFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/NullFilter.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/NullFilter.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/NullFilter.java Tue Sep 25 07:31:06 2007
@@ -29,21 +29,21 @@
public class NullFilter extends PDFFilter {
/**
- * @see org.apache.fop.pdf.PDFFilter#getName()
+ * {@inheritDoc}
*/
public String getName() {
return "";
}
/**
- * @see org.apache.fop.pdf.PDFFilter#getDecodeParms()
+ * {@inheritDoc}
*/
public String getDecodeParms() {
return null;
}
/**
- * @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
+ * {@inheritDoc}
*/
public OutputStream applyFilter(OutputStream out) throws IOException {
return out;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFAMode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFAMode.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFAMode.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFAMode.java Tue Sep 25 07:31:06 2007
@@ -65,7 +65,7 @@
}
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
return name;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFAnnotList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFAnnotList.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFAnnotList.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFAnnotList.java Tue Sep 25 07:31:06 2007
@@ -54,7 +54,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer p = new StringBuffer(128);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFArray.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFArray.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFArray.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFArray.java Tue Sep 25 07:31:06 2007
@@ -114,7 +114,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer p = new StringBuffer(64);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFCIDFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFCIDFont.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFCIDFont.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFCIDFont.java Tue Sep 25 07:31:06 2007
@@ -195,7 +195,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer p = new StringBuffer(128);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDestination.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDestination.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDestination.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDestination.java Tue Sep 25 07:31:06 2007
@@ -59,7 +59,7 @@
return sb.toString();
}
- /** @see org.apache.fop.pdf.PDFObject#toPDFString() */
+ /** {@inheritDoc} */
protected String toPDFString() {
return toKeyValuePair();
}
@@ -125,7 +125,7 @@
}
/**
- * @see java.lang.Object#hashCode()
+ * {@inheritDoc}
*/
public int hashCode() {
return getIDRef().hashCode();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDeviceColorSpace.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDeviceColorSpace.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDeviceColorSpace.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDeviceColorSpace.java Tue Sep 25 07:31:06 2007
@@ -117,22 +117,22 @@
}
}
- /** @see org.apache.fop.pdf.PDFColorSpace#isDeviceColorSpace() */
+ /** {@inheritDoc} */
public boolean isDeviceColorSpace() {
return true;
}
- /** @see org.apache.fop.pdf.PDFColorSpace#isRGBColorSpace() */
+ /** {@inheritDoc} */
public boolean isRGBColorSpace() {
return getColorSpace() == DEVICE_RGB;
}
- /** @see org.apache.fop.pdf.PDFColorSpace#isCMYKColorSpace() */
+ /** {@inheritDoc} */
public boolean isCMYKColorSpace() {
return getColorSpace() == DEVICE_CMYK;
}
- /** @see org.apache.fop.pdf.PDFColorSpace#isGrayColorSpace() */
+ /** {@inheritDoc} */
public boolean isGrayColorSpace() {
return getColorSpace() == DEVICE_GRAY;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDictionary.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDictionary.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDictionary.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDictionary.java Tue Sep 25 07:31:06 2007
@@ -69,7 +69,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer p = new StringBuffer(64);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFEncoding.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFEncoding.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFEncoding.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFEncoding.java Tue Sep 25 07:31:06 2007
@@ -89,7 +89,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer p = new StringBuffer(128);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java Tue Sep 25 07:31:06 2007
@@ -89,7 +89,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFFilter#encode(InputStream, OutputStream, int)
+ * {@inheritDoc}
*/
public void encode(InputStream in, OutputStream out, int length)
throws IOException {
@@ -100,7 +100,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFFilter#applyFilter(OutputStream)
+ * {@inheritDoc}
*/
public OutputStream applyFilter(OutputStream out) throws IOException {
return new CipherOutputStream(out,
@@ -365,7 +365,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFEncryption#encrypt(byte[], PDFObject)
+ * {@inheritDoc}
*/
public byte[] encrypt(byte[] data, PDFObject refObj) {
return encryptData(data, refObj.getObjectNumber(), refObj.getGeneration());
@@ -420,7 +420,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFEncryption#getTrailerEntry()
+ * {@inheritDoc}
*/
public String getTrailerEntry() {
return "/Encrypt " + getObjectNumber() + " "
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFactory.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFactory.java Tue Sep 25 07:31:06 2007
@@ -1473,7 +1473,7 @@
* Create a PDFICCStream
* @see PDFXObject
* @see org.apache.fop.image.JpegImage
- * @see org.apache.fop.pdf.PDFDeviceColorSpace
+ * @see org.apache.fop.pdf.PDFDeviceColorSpace
* @return the new PDF ICC stream object
*/
public PDFICCStream makePDFICCStream() {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFileSpec.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFileSpec.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFileSpec.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFileSpec.java Tue Sep 25 07:31:06 2007
@@ -44,7 +44,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
return getObjectID()
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFont.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFont.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFont.java Tue Sep 25 07:31:06 2007
@@ -204,7 +204,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
validate();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontDescriptor.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontDescriptor.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontDescriptor.java Tue Sep 25 07:31:06 2007
@@ -137,7 +137,7 @@
// public void setCharSet(){}//for subset fonts
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer p = new StringBuffer(128);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontNonBase14.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontNonBase14.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontNonBase14.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontNonBase14.java Tue Sep 25 07:31:06 2007
@@ -94,7 +94,7 @@
return this.descriptor;
}
- /** @see org.apache.fop.pdf.PDFFont#validate() */
+ /** {@inheritDoc} */
protected void validate() {
if (getDocumentSafely().getProfile().isFontEmbeddingRequired()) {
if (this.getDescriptor().getFontFile() == null) {
@@ -105,7 +105,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFFont#fillInPDF(StringBuffer)
+ * {@inheritDoc}
*/
protected void fillInPDF(StringBuffer target) {
target.append("\n/FirstChar ");
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontType0.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontType0.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontType0.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontType0.java Tue Sep 25 07:31:06 2007
@@ -94,7 +94,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFFont#fillInPDF(StringBuffer)
+ * {@inheritDoc}
*/
protected void fillInPDF(StringBuffer target) {
if (descendantFonts != null) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontType3.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontType3.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontType3.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFontType3.java Tue Sep 25 07:31:06 2007
@@ -124,7 +124,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFFont#fillInPDF(StringBuffer)
+ * {@inheritDoc}
*/
protected void fillInPDF(StringBuffer target) {
if (fontBBox != null) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFormXObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFormXObject.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFormXObject.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFormXObject.java Tue Sep 25 07:31:06 2007
@@ -97,7 +97,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFStream#outputRawStreamData(OutputStream)
+ * {@inheritDoc}
*/
protected void outputRawStreamData(OutputStream out) throws IOException {
contents.outputRawStreamData(out);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGState.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGState.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGState.java Tue Sep 25 07:31:06 2007
@@ -145,7 +145,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer sb = new StringBuffer(64);
@@ -176,7 +176,7 @@
*/
/**
- * @see java.lang.Object#equals(Object)
+ * {@inheritDoc}
*/
public boolean equals(Object obj) {
if (obj == this) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGoTo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGoTo.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGoTo.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGoTo.java Tue Sep 25 07:31:06 2007
@@ -118,7 +118,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
String dest;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGoToRemote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGoToRemote.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGoToRemote.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFGoToRemote.java Tue Sep 25 07:31:06 2007
@@ -81,7 +81,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer sb = new StringBuffer(64);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java Tue Sep 25 07:31:06 2007
@@ -50,12 +50,12 @@
return this.iccStream;
}
- /** @see org.apache.fop.pdf.PDFColorSpace#getNumComponents() */
+ /** {@inheritDoc} */
public int getNumComponents() {
return iccStream.getICCProfile().getNumComponents();
}
- /** @see org.apache.fop.pdf.PDFColorSpace#getName() */
+ /** {@inheritDoc} */
public String getName() {
if (explicitName != null) {
return explicitName;
@@ -64,27 +64,27 @@
}
}
- /** @see org.apache.fop.pdf.PDFColorSpace#isDeviceColorSpace() */
+ /** {@inheritDoc} */
public boolean isDeviceColorSpace() {
return false;
}
- /** @see org.apache.fop.pdf.PDFColorSpace#isRGBColorSpace() */
+ /** {@inheritDoc} */
public boolean isRGBColorSpace() {
return getNumComponents() == 3;
}
- /** @see org.apache.fop.pdf.PDFColorSpace#isCMYKColorSpace() */
+ /** {@inheritDoc} */
public boolean isCMYKColorSpace() {
return getNumComponents() == 4;
}
- /** @see org.apache.fop.pdf.PDFColorSpace#isGrayColorSpace() */
+ /** {@inheritDoc} */
public boolean isGrayColorSpace() {
return getNumComponents() == 1;
}
- /** @see org.apache.fop.pdf.PDFObject#toPDFString() */
+ /** {@inheritDoc} */
protected String toPDFString() {
StringBuffer sb = new StringBuffer(64);
sb.append(getObjectID());
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFICCStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFICCStream.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFICCStream.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFICCStream.java Tue Sep 25 07:31:06 2007
@@ -57,7 +57,7 @@
/**
* overload the base object method so we don't have to copy
* byte arrays around so much
- * @see org.apache.fop.pdf.PDFObject#output(OutputStream)
+ * {@inheritDoc}
*/
protected int output(java.io.OutputStream stream)
throws java.io.IOException {
@@ -67,14 +67,14 @@
}
/**
- * @see org.apache.fop.pdf.PDFStream#outputRawStreamData(OutputStream)
+ * {@inheritDoc}
*/
protected void outputRawStreamData(OutputStream out) throws IOException {
cp.write(out);
}
/**
- * @see org.apache.fop.pdf.AbstractPDFStream#buildStreamDict(String)
+ * {@inheritDoc}
*/
protected String buildStreamDict(String lengthEntry) {
final String filterEntry = getFilterList().buildFilterDictEntries();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFInfo.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFInfo.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFInfo.java Tue Sep 25 07:31:06 2007
@@ -159,7 +159,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDF()
+ * {@inheritDoc}
*/
public byte[] toPDF() {
PDFProfile profile = getDocumentSafely().getProfile();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFInternalLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFInternalLink.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFInternalLink.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFInternalLink.java Tue Sep 25 07:31:06 2007
@@ -46,7 +46,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
protected String toPDFString() {
throw new UnsupportedOperationException("This method should not be called");
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFLink.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFLink.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFLink.java Tue Sep 25 07:31:06 2007
@@ -69,7 +69,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
getDocumentSafely().getProfile().verifyAnnotAllowed();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFMetadata.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFMetadata.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFMetadata.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFMetadata.java Tue Sep 25 07:31:06 2007
@@ -58,7 +58,7 @@
this.readOnly = readOnly;
}
- /** @see org.apache.fop.pdf.AbstractPDFStream#setupFilterList() */
+ /** {@inheritDoc} */
protected void setupFilterList() {
if (!getFilterList().isInitialized()) {
getFilterList().addDefaultFilters(
@@ -78,7 +78,7 @@
/**
* overload the base object method so we don't have to copy
* byte arrays around so much
- * @see org.apache.fop.pdf.PDFObject#output(OutputStream)
+ * {@inheritDoc}
*/
protected int output(java.io.OutputStream stream)
throws java.io.IOException {
@@ -87,7 +87,7 @@
return length;
}
- /** @see org.apache.fop.pdf.AbstractPDFStream#outputRawStreamData(java.io.OutputStream) */
+ /** {@inheritDoc} */
protected void outputRawStreamData(OutputStream out) throws IOException {
try {
XMPSerializer.writeXMPPacket(xmpMetadata, out, this.readOnly);
@@ -100,7 +100,7 @@
}
}
- /** @see org.apache.fop.pdf.AbstractPDFStream#buildStreamDict(String) */
+ /** {@inheritDoc} */
protected String buildStreamDict(String lengthEntry) {
final String filterEntry = getFilterList().buildFilterDictEntries();
if (getDocumentSafely().getProfile().getPDFAMode().isPDFA1LevelB()
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFNumber.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFNumber.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFNumber.java Tue Sep 25 07:31:06 2007
@@ -103,7 +103,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
protected String toPDFString() {
if (getNumber() == null) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFOutline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFOutline.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFOutline.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFOutline.java Tue Sep 25 07:31:06 2007
@@ -127,7 +127,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDF()
+ * {@inheritDoc}
*/
protected byte[] toPDF() {
ByteArrayOutputStream bout = new ByteArrayOutputStream(128);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFOutputIntent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFOutputIntent.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFOutputIntent.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFOutputIntent.java Tue Sep 25 07:31:06 2007
@@ -126,7 +126,7 @@
this.destOutputProfile = destOutputProfile;
}
- /** @see org.apache.fop.pdf.PDFObject#toPDF() */
+ /** {@inheritDoc} */
public byte[] toPDF() {
ByteArrayOutputStream bout = new ByteArrayOutputStream(128);
try {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFPage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFPage.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFPage.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFPage.java Tue Sep 25 07:31:06 2007
@@ -153,7 +153,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer sb = new StringBuffer();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFPages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFPages.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFPages.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFPages.java Tue Sep 25 07:31:06 2007
@@ -106,7 +106,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer sb = new StringBuffer(64);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFProfile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFProfile.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFProfile.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFProfile.java Tue Sep 25 07:31:06 2007
@@ -119,7 +119,7 @@
validateProfileCombination();
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer();
if (isPDFAActive() && isPDFXActive()) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFReference.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFReference.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFReference.java Tue Sep 25 07:31:06 2007
@@ -59,7 +59,7 @@
}
}
- /** @see org.apache.fop.pdf.PDFWritable#toInlinePDFString() */
+ /** {@inheritDoc} */
public String toInlinePDFString() {
return this.indirectReference;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFResources.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFResources.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFResources.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFResources.java Tue Sep 25 07:31:06 2007
@@ -184,7 +184,7 @@
* resource context.
*
* @return the PDF
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer p = new StringBuffer(128);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFRoot.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFRoot.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFRoot.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFRoot.java Tue Sep 25 07:31:06 2007
@@ -174,7 +174,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
StringBuffer p = new StringBuffer(128);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFState.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFState.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFState.java Tue Sep 25 07:31:06 2007
@@ -364,7 +364,7 @@
public PDFGState gstate = null;
- /** @see java.lang.Object#clone() */
+ /** {@inheritDoc} */
public Object clone() throws CloneNotSupportedException {
Data obj = new Data();
obj.color = this.color;
@@ -408,7 +408,7 @@
transform.concatenate(at);
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
return super.toString() + ", " + this.transform;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFStream.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFStream.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFStream.java Tue Sep 25 07:31:06 2007
@@ -90,21 +90,21 @@
}
/**
- * @see org.apache.fop.pdf.AbstractPDFStream#getSizeHint()
+ * {@inheritDoc}
*/
protected int getSizeHint() throws IOException {
return data.getSize();
}
/**
- * @see org.apache.fop.pdf.AbstractPDFStream#outputRawStreamData(OutputStream)
+ * {@inheritDoc}
*/
protected void outputRawStreamData(OutputStream out) throws IOException {
data.outputContents(out);
}
/**
- * @see org.apache.fop.pdf.PDFObject#output(OutputStream)
+ * {@inheritDoc}
*/
protected int output(OutputStream stream) throws IOException {
final int len = super.output(stream);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFT1Stream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFT1Stream.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFT1Stream.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFT1Stream.java Tue Sep 25 07:31:06 2007
@@ -34,7 +34,7 @@
private PFBData pfb;
/**
- * @see org.apache.fop.pdf.AbstractPDFStream#getSizeHint()
+ * {@inheritDoc}
*/
protected int getSizeHint() throws IOException {
if (this.pfb != null) {
@@ -47,7 +47,7 @@
/**
* Overload the base object method so we don't have to copy
* byte arrays around so much
- * @see org.apache.fop.pdf.PDFObject#output(OutputStream)
+ * {@inheritDoc}
*/
protected int output(java.io.OutputStream stream)
throws java.io.IOException {
@@ -62,7 +62,7 @@
}
/**
- * @see org.apache.fop.pdf.AbstractPDFStream#buildStreamDict(String)
+ * {@inheritDoc}
*/
protected String buildStreamDict(String lengthEntry) {
final String filterEntry = getFilterList().buildFilterDictEntries();
@@ -76,7 +76,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFStream#outputRawStreamData(OutputStream)
+ * {@inheritDoc}
*/
protected void outputRawStreamData(OutputStream out) throws IOException {
this.pfb.outputAllParts(out);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFTTFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFTTFStream.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFTTFStream.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFTTFStream.java Tue Sep 25 07:31:06 2007
@@ -40,7 +40,7 @@
/**
* Overload the base object method so we don't have to copy
* byte arrays around so much
- * @see org.apache.fop.pdf.PDFObject#output(OutputStream)
+ * {@inheritDoc}
*/
protected int output(java.io.OutputStream stream)
throws java.io.IOException {
@@ -52,7 +52,7 @@
}
/**
- * @see org.apache.fop.pdf.AbstractPDFStream#buildStreamDict(String)
+ * {@inheritDoc}
*/
protected String buildStreamDict(String lengthEntry) {
final String filterEntry = getFilterList().buildFilterDictEntries();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFText.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFText.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFText.java Tue Sep 25 07:31:06 2007
@@ -52,7 +52,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
protected String toPDFString() {
if (getText() == null) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFToUnicodeCMap.java Tue Sep 25 07:31:06 2007
@@ -54,7 +54,7 @@
cidFont = cidMetrics;
}
- /** @see org.apache.fop.pdf.PDFCMap#fillInPDF(java.lang.StringBuffer) */
+ /** {@inheritDoc} */
public void fillInPDF(StringBuffer p) {
writeCIDInit(p);
writeCIDSystemInfo(p);
@@ -65,7 +65,7 @@
add(p.toString());
}
- /** @see org.apache.fop.pdf.PDFCMap#writeCIDSystemInfo(java.lang.StringBuffer) */
+ /** {@inheritDoc} */
protected void writeCIDSystemInfo(StringBuffer p) {
p.append("/CIDSystemInfo\n");
p.append("<< /Registry (Adobe)\n");
@@ -74,7 +74,7 @@
p.append(">> def\n");
}
- /** @see org.apache.fop.pdf.PDFCMap#writeVersionTypeName(java.lang.StringBuffer) */
+ /** {@inheritDoc} */
protected void writeVersionTypeName(StringBuffer p) {
p.append("/CMapName /Adobe-Identity-UCS def\n");
p.append("/CMapType 2 def\n");
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFUri.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFUri.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFUri.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFUri.java Tue Sep 25 07:31:06 2007
@@ -45,7 +45,7 @@
}
/**
- * @see org.apache.fop.pdf.PDFObject#toPDFString()
+ * {@inheritDoc}
*/
public String toPDFString() {
throw new UnsupportedOperationException("This method should not be called");
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFXMode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFXMode.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFXMode.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFXMode.java Tue Sep 25 07:31:06 2007
@@ -55,7 +55,7 @@
}
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
return name;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFXObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFXObject.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFXObject.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFXObject.java Tue Sep 25 07:31:06 2007
@@ -82,7 +82,7 @@
}
/**
- * @see org.apache.fop.pdf.AbstractPDFStream#buildStreamDict(String)
+ * {@inheritDoc}
*/
protected String buildStreamDict(String lengthEntry) {
String dictEntries = getFilterList().buildFilterDictEntries();
@@ -164,21 +164,21 @@
}
/**
- * @see org.apache.fop.pdf.PDFStream#outputRawStreamData(OutputStream)
+ * {@inheritDoc}
*/
protected void outputRawStreamData(OutputStream out) throws IOException {
pdfimage.outputContents(out);
}
/**
- * @see org.apache.fop.pdf.AbstractPDFStream#getSizeHint()
+ * {@inheritDoc}
*/
protected int getSizeHint() throws IOException {
return 0;
}
/**
- * @see org.apache.fop.pdf.AbstractPDFStream#prepareImplicitFilters()
+ * {@inheritDoc}
*/
protected void prepareImplicitFilters() {
PDFFilter pdfFilter = pdfimage.getPDFFilter();
@@ -190,7 +190,7 @@
/**
* This sets up the default filters for XObjects. It uses the PDFImage
* instance to determine what default filters to apply.
- * @see org.apache.fop.pdf.AbstractPDFStream#setupFilterList()
+ * {@inheritDoc}
*/
protected void setupFilterList() {
if (!getFilterList().isInitialized()) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/TempFileStreamCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/TempFileStreamCache.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/TempFileStreamCache.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/TempFileStreamCache.java Tue Sep 25 07:31:06 2007
@@ -70,7 +70,7 @@
}
/**
- * @see org.apache.fop.pdf.StreamCache#write(byte[])
+ * {@inheritDoc}
*/
public void write(byte[] data) throws IOException {
getOutputStream().write(data);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org