xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r679326 [19/33] - in /xmlgraphics/fop/trunk: examples/embedding/java/embedding/ examples/embedding/java/embedding/events/ examples/embedding/java/embedding/intermediate/ examples/embedding/java/embedding/model/ examples/embedding/java/embed...
Date Thu, 24 Jul 2008 09:37:16 GMT
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -59,7 +59,7 @@
  * LayoutManager for a list-item FO.
  * The list item contains a list item label and a list item body.
  */
-public class ListItemLayoutManager extends BlockStackingLayoutManager 
+public class ListItemLayoutManager extends BlockStackingLayoutManager
                     implements ConditionalElementListener {
 
     /**
@@ -81,19 +81,19 @@
     private boolean discardPaddingAfter;
     private MinOptMax effSpaceBefore;
     private MinOptMax effSpaceAfter;
-    
+
     private int keepWithNextPendingOnLabel;
     private int keepWithNextPendingOnBody;
 
     private int listItemHeight;
-    
+
     private class ListItemPosition extends Position {
         private int iLabelFirstIndex;
         private int iLabelLastIndex;
         private int iBodyFirstIndex;
         private int iBodyLastIndex;
 
-        public ListItemPosition(LayoutManager lm, int labelFirst, int labelLast, 
+        public ListItemPosition(LayoutManager lm, int labelFirst, int labelLast,
                 int bodyFirst, int bodyLast) {
             super(lm);
             iLabelFirstIndex = labelFirst;
@@ -101,11 +101,11 @@
             iBodyFirstIndex = bodyFirst;
             iBodyLastIndex = bodyLast;
         }
-        
+
         public int getLabelFirstIndex() {
             return iLabelFirstIndex;
         }
-        
+
         public int getLabelLastIndex() {
             return iLabelLastIndex;
         }
@@ -113,11 +113,11 @@
         public int getBodyFirstIndex() {
             return iBodyFirstIndex;
         }
-        
+
         public int getBodyLastIndex() {
             return iBodyLastIndex;
         }
-        
+
         /** {@inheritDoc} */
         public boolean generatesAreas() {
             return true;
@@ -166,7 +166,7 @@
      * @param node the fo:list-item-body FO
      */
     public void setBody(ListItemBody node) {
-        body = new ListItemContentLayoutManager(node); 
+        body = new ListItemContentLayoutManager(node);
         body.setParent(this);
     }
 
@@ -177,25 +177,25 @@
         foSpaceAfter = new SpaceVal(
                 getListItemFO().getCommonMarginBlock().spaceAfter, this).getSpace();
         startIndent = getListItemFO().getCommonMarginBlock().startIndent.getValue(this);
-        endIndent = getListItemFO().getCommonMarginBlock().endIndent.getValue(this); 
+        endIndent = getListItemFO().getCommonMarginBlock().endIndent.getValue(this);
     }
 
     private void resetSpaces() {
-        this.discardBorderBefore = false;        
-        this.discardBorderAfter = false;        
-        this.discardPaddingBefore = false;        
+        this.discardBorderBefore = false;
+        this.discardBorderAfter = false;
+        this.discardPaddingBefore = false;
         this.discardPaddingAfter = false;
         this.effSpaceBefore = null;
         this.effSpaceAfter = null;
     }
-    
+
     /** {@inheritDoc} */
     public List getNextKnuthElements(LayoutContext context, int alignment) {
         referenceIPD = context.getRefIPD();
         LayoutContext childLC;
-        
+
         List returnList = new LinkedList();
-        
+
         if (!breakBeforeServed) {
             try {
                 if (addKnuthElementsForBreakBefore(returnList, context)) {
@@ -207,7 +207,7 @@
         }
 
         addKnuthElementsForSpaceBefore(returnList, alignment);
-        
+
         addKnuthElementsForBorderPaddingBefore(returnList, !firstVisibleMarkServed);
         firstVisibleMarkServed = true;
 
@@ -219,12 +219,12 @@
         childLC.setRefIPD(context.getRefIPD());
         label.initialize();
         labelList = label.getNextKnuthElements(childLC, alignment);
-        
+
         //Space resolution as if the contents were placed in a new reference area
         //(see 6.8.3, XSL 1.0, section on Constraints, last paragraph)
         SpaceResolver.resolveElementList(labelList);
         ElementListObserver.observe(labelList, "list-item-label", label.getPartFO().getId());
-        
+
         context.updateKeepWithPreviousPending(childLC.getKeepWithPreviousPending());
         this.keepWithNextPendingOnLabel = childLC.getKeepWithNextPending();
 
@@ -238,7 +238,7 @@
         //(see 6.8.3, XSL 1.0, section on Constraints, last paragraph)
         SpaceResolver.resolveElementList(bodyList);
         ElementListObserver.observe(bodyList, "list-item-body", body.getPartFO().getId());
-        
+
         context.updateKeepWithPreviousPending(childLC.getKeepWithPreviousPending());
         this.keepWithNextPendingOnBody = childLC.getKeepWithNextPending();
 
@@ -247,7 +247,7 @@
 
         // "wrap" the Position inside each element
         wrapPositionElements(returnedList, returnList, true);
-        
+
         addKnuthElementsForBorderPaddingAfter(returnList, true);
         addKnuthElementsForSpaceAfter(returnList, alignment);
         addKnuthElementsForBreakAfter(returnList, context);
@@ -280,7 +280,7 @@
 
         LinkedList returnList = new LinkedList();
         while ((step = getNextStep(elementLists, start, end, partialHeights)) > 0) {
-            
+
             if (end[0] + 1 == elementLists[0].size()) {
                 keepWithNextActive = Math.max(keepWithNextActive, keepWithNextPendingOnLabel);
             }
@@ -289,10 +289,10 @@
             }
 
             // compute penalty height and box height
-            int penaltyHeight = step 
-                + getMaxRemainingHeight(fullHeights, partialHeights) 
+            int penaltyHeight = step
+                + getMaxRemainingHeight(fullHeights, partialHeights)
                 - totalHeight;
-            
+
             //Additional penalty height from penalties in the source lists
             int additionalPenaltyHeight = 0;
             int stepPenalty = 0;
@@ -307,7 +307,7 @@
                         additionalPenaltyHeight, endEl.getW());
                 stepPenalty = Math.max(stepPenalty, endEl.getP());
             }
-            
+
             int boxHeight = step - addedBoxHeight - penaltyHeight;
             penaltyHeight += additionalPenaltyHeight; //Add AFTER calculating boxHeight!
 
@@ -330,7 +330,7 @@
 
             // add the new elements
             addedBoxHeight += boxHeight;
-            ListItemPosition stepPosition = new ListItemPosition(this, 
+            ListItemPosition stepPosition = new ListItemPosition(this,
                     start[0], end[0], start[1], end[1]);
             if (footnoteList == null) {
                 returnList.add(new KnuthBox(boxHeight, stepPosition, false));
@@ -394,7 +394,7 @@
         if (seqCount == 0) {
             return 0;
         }
-        
+
         // determine next step
         int step;
         if (backupHeights[0] == 0 && backupHeights[1] == 0) {
@@ -426,7 +426,7 @@
     }
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public List getChangedKnuthElements(List oldList, int alignment) {
         //log.debug(" LILM.getChanged> label");
@@ -441,10 +441,10 @@
         while (oldListIterator.hasNext()) {
             oldElement = (KnuthElement)oldListIterator.next();
             Position innerPosition = oldElement.getPosition().getPosition();
-            //log.debug(" BLM> unwrapping: " + (oldElement.isBox() 
-            //  ? "box    " : (oldElement.isGlue() ? "glue   " : "penalty")) 
+            //log.debug(" BLM> unwrapping: " + (oldElement.isBox()
+            //  ? "box    " : (oldElement.isGlue() ? "glue   " : "penalty"))
             //  + " creato da " + oldElement.getLayoutManager().getClass().getName());
-            //log.debug(" BLM> unwrapping:         " 
+            //log.debug(" BLM> unwrapping:         "
             //  + oldElement.getPosition().getClass().getName());
             if (innerPosition != null) {
                 // oldElement was created by a descendant of this BlockLM
@@ -508,7 +508,7 @@
 
         addMarkersToPage(true, isFirst(firstPos), isLast(lastPos));
 
-        // use the first and the last ListItemPosition to determine the 
+        // use the first and the last ListItemPosition to determine the
         // corresponding indexes in the original labelList and bodyList
         int labelFirstIndex = ((ListItemPosition) positionList.getFirst()).getLabelFirstIndex();
         int labelLastIndex = ((ListItemPosition) positionList.getLast()).getLabelLastIndex();
@@ -517,17 +517,17 @@
 
         //Determine previous break if any
         int previousBreak = ElementListUtils.determinePreviousBreak(labelList, labelFirstIndex);
-        SpaceResolver.performConditionalsNotification(labelList, 
+        SpaceResolver.performConditionalsNotification(labelList,
                 labelFirstIndex, labelLastIndex, previousBreak);
 
         //Determine previous break if any
         previousBreak = ElementListUtils.determinePreviousBreak(bodyList, bodyFirstIndex);
-        SpaceResolver.performConditionalsNotification(bodyList, 
+        SpaceResolver.performConditionalsNotification(bodyList,
                 bodyFirstIndex, bodyLastIndex, previousBreak);
-        
+
         // add label areas
         if (labelFirstIndex <= labelLastIndex) {
-            KnuthPossPosIter labelIter = new KnuthPossPosIter(labelList, 
+            KnuthPossPosIter labelIter = new KnuthPossPosIter(labelList,
                     labelFirstIndex, labelLastIndex + 1);
             lc.setFlags(LayoutContext.FIRST_AREA, layoutContext.isFirstArea());
             lc.setFlags(LayoutContext.LAST_AREA, layoutContext.isLastArea());
@@ -548,7 +548,7 @@
 
         // add body areas
         if (bodyFirstIndex <= bodyLastIndex) {
-            KnuthPossPosIter bodyIter = new KnuthPossPosIter(bodyList, 
+            KnuthPossPosIter bodyIter = new KnuthPossPosIter(bodyList,
                     bodyFirstIndex, bodyLastIndex + 1);
             lc.setFlags(LayoutContext.FIRST_AREA, layoutContext.isFirstArea());
             lc.setFlags(LayoutContext.LAST_AREA, layoutContext.isLastArea());
@@ -567,17 +567,17 @@
         addMarkersToPage(false, isFirst(firstPos), isLast(lastPos));
 
         // We are done with this area add the background
-        TraitSetter.addBackground(curBlockArea, 
+        TraitSetter.addBackground(curBlockArea,
                 getListItemFO().getCommonBorderPaddingBackground(),
                 this);
-        TraitSetter.addSpaceBeforeAfter(curBlockArea, layoutContext.getSpaceAdjust(), 
+        TraitSetter.addSpaceBeforeAfter(curBlockArea, layoutContext.getSpaceAdjust(),
                 effSpaceBefore, effSpaceAfter);
 
         flush();
 
         curBlockArea = null;
         resetSpaces();
-        
+
         checkEndOfLayout(lastPos);
     }
 
@@ -610,22 +610,22 @@
 
             // Set up dimensions
             /*Area parentArea =*/ parentLM.getParentArea(curBlockArea);
-            
+
             // set traits
             TraitSetter.setProducerID(curBlockArea, getListItemFO().getId());
-            TraitSetter.addBorders(curBlockArea, 
-                    getListItemFO().getCommonBorderPaddingBackground(), 
+            TraitSetter.addBorders(curBlockArea,
+                    getListItemFO().getCommonBorderPaddingBackground(),
                     discardBorderBefore, discardBorderAfter, false, false, this);
-            TraitSetter.addPadding(curBlockArea, 
-                    getListItemFO().getCommonBorderPaddingBackground(), 
+            TraitSetter.addPadding(curBlockArea,
+                    getListItemFO().getCommonBorderPaddingBackground(),
                     discardPaddingBefore, discardPaddingAfter, false, false, this);
             TraitSetter.addMargins(curBlockArea,
-                    getListItemFO().getCommonBorderPaddingBackground(), 
+                    getListItemFO().getCommonBorderPaddingBackground(),
                     getListItemFO().getCommonMarginBlock(), this);
-            TraitSetter.addBreaks(curBlockArea, 
-                    getListItemFO().getBreakBefore(), 
+            TraitSetter.addBreaks(curBlockArea,
+                    getListItemFO().getBreakBefore(),
                     getListItemFO().getBreakAfter());
-            
+
             int contentIPD = referenceIPD - getIPIndents();
             curBlockArea.setIPD(contentIPD);
 
@@ -669,13 +669,13 @@
     public void notifySpace(RelSide side, MinOptMax effectiveLength) {
         if (RelSide.BEFORE == side) {
             if (log.isDebugEnabled()) {
-                log.debug(this + ": Space " + side + ", " 
+                log.debug(this + ": Space " + side + ", "
                         + this.effSpaceBefore + "-> " + effectiveLength);
             }
             this.effSpaceBefore = effectiveLength;
         } else {
             if (log.isDebugEnabled()) {
-                log.debug(this + ": Space " + side + ", " 
+                log.debug(this + ": Space " + side + ", "
                         + this.effSpaceAfter + "-> " + effectiveLength);
             }
             this.effSpaceAfter = effectiveLength;
@@ -710,6 +710,6 @@
         }
     }
 
-    
+
 }
 

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java Thu Jul 24 02:35:34 2008
@@ -173,7 +173,7 @@
      * Returns the actual length of the content represented by the given element. In the
      * case where this element is used as a filler to match a row's fixed height, the
      * value returned by the getW() method will be higher than the actual content.
-     * 
+     *
      * @param el an element
      * @return the actual content length corresponding to the element
      */
@@ -226,7 +226,7 @@
     /**
      * Modifies the cell's element list by putting filler elements, so that the cell's or
      * row's explicit height is always reached.
-     * 
+     *
      * TODO this will work properly only for the first break. Then the limitation
      * explained on http://wiki.apache.org/xmlgraphics-fop/TableLayout/KnownProblems
      * occurs. The list of elements needs to be re-adjusted after each break.
@@ -269,7 +269,7 @@
 
     /**
      * Returns true if this cell ends on the given row.
-     * 
+     *
      * @param rowIndex index of a row in the row-group, zero-based
      * @return true if this cell ends on the given row
      */
@@ -280,7 +280,7 @@
     /**
      * Returns the length of this cell's content not yet included in the steps, plus the
      * cell's borders and paddings if applicable.
-     * 
+     *
      * @return the remaining length, zero if the cell is finished
      */
     int getRemainingLength() {
@@ -341,12 +341,12 @@
         afterNextStep.end = knuthIter.nextIndex() - 1;
         afterNextStep.totalLength = bpBeforeNormal
                 + afterNextStep.contentLength + afterNextStep.penaltyLength
-                + bpAfterTrailing; 
+                + bpAfterTrailing;
     }
 
     /**
      * Returns the minimal step that is needed for this cell to contribute some content.
-     *  
+     *
      * @return the step for this cell's first legal break
      */
     int getFirstStep() {
@@ -363,7 +363,7 @@
      * infinite penalty, plus the cell's content won't be taken into account since the
      * final step will be smaller than the current one (see {@link #signalNextStep(int)}).
      * This actually means that the content will be swallowed.
-     * 
+     *
      * @return the length of last step
      */
     int getLastStep() {
@@ -377,7 +377,7 @@
 
     /**
      * Increases the next step up to the given limit.
-     * 
+     *
      * @param limit the length up to which the next step is allowed to increase
      * @see #signalRowFirstStep(int)
      * @see #signalRowLastStep(int)
@@ -398,7 +398,7 @@
      * Gets the selected first step for the current row. If this cell's first step is
      * smaller, then it may be able to add some more of its content, since there will be
      * no break before the given step anyway.
-     * 
+     *
      * @param firstStep the current row's first step
      */
     void signalRowFirstStep(int firstStep) {
@@ -418,7 +418,7 @@
 
     /**
      * Returns the total length up to the next legal break, not yet included in the steps.
-     * 
+     *
      * @return the total length up to the next legal break (-1 signals no further step)
      */
     int getNextStep() {
@@ -446,7 +446,7 @@
     /**
      * Signals the length of the chosen next step, so that this cell determines whether
      * its own step may be included or not.
-     * 
+     *
      * @param minStep length of the chosen next step
      * @return the break class of the step, if any. One of {@link Constants#EN_AUTO},
      * {@link Constants#EN_COLUMN}, {@link Constants#EN_PAGE},
@@ -487,7 +487,7 @@
     /**
      * Receives indication that the current row is ending, and that (collapse) borders
      * must be updated accordingly.
-     * 
+     *
      * @param rowIndex the index of the ending row
      */
     void endRow(int rowIndex) {
@@ -508,7 +508,7 @@
     /**
      * Returns true if this cell would be finished after the given step. That is, it would
      * be included in the step and the end of its content would be reached.
-     * 
+     *
      * @param step the next step
      * @return true if this cell finishes at the given step
      */
@@ -519,7 +519,7 @@
     /**
      * Creates and returns a CellPart instance for the content of this cell which
      * is included in the next step.
-     * 
+     *
      * @return a CellPart instance
      */
     CellPart createCellPart() {
@@ -557,7 +557,7 @@
     /**
      * Adds the footnotes (if any) that are part of the next step, if this cell
      * contributes content to the next step.
-     * 
+     *
      * @param footnoteList the list to which this cell must add its footnotes
      */
     void addFootnotes(List footnoteList) {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CellPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CellPart.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CellPart.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CellPart.java Thu Jul 24 02:35:34 2008
@@ -44,7 +44,7 @@
 
     /**
      * Creates a new CellPart.
-     * 
+     *
      * @param pgu Primary grid unit
      * @param start starting element
      * @param end ending element

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java Thu Jul 24 02:35:34 2008
@@ -131,7 +131,7 @@
 
     /**
      * Compares the two given styles (see {@link Constants}).
-     * 
+     *
      * @param style1 a style constant
      * @param style2 another style constant
      * @return a value &lt; 0 if style1 has less priority than style2, 0 if both are
@@ -161,7 +161,7 @@
     /**
      * Compares the two given FO ids ({@link Constants}.FO*) in terms of border
      * declaration.
-     * 
+     *
      * @param id1 a FO id ({@link Constants#FO_TABLE}, {@link Constants#FO_TABLE_BODY},
      * etc.)
      * @param id2 another FO id
@@ -178,7 +178,7 @@
      * Returns the border which wins the border conflict resolution. In case the two
      * borders are equivalent (identical, or only the color is different), null is
      * returned.
-     * 
+     *
      * @param border1 a border specification
      * @param border2 another border specification
      * @param discard true if the .conditionality component of the border width must be
@@ -192,7 +192,7 @@
      * Returns the border which wins the border conflict resolution. Same as
      * {@link #determineWinner(BorderSpecification, BorderSpecification, boolean)
      * determineWinner(border1, border2, false)}.
-     * 
+     *
      * @param border1 a border specification
      * @param border2 another border specification
      * @return the winning border, null if the two borders are equivalent

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java Thu Jul 24 02:35:34 2008
@@ -26,7 +26,7 @@
 
 /**
  * Implements the normal "collapse" border model defined in 6.7.10 in XSL 1.0.
- * 
+ *
  * TODO Column groups are not yet checked in this algorithm!
  */
 public class CollapsingBorderModelEyeCatching extends CollapsingBorderModel {

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java Thu Jul 24 02:35:34 2008
@@ -45,9 +45,9 @@
     private Table table;
     private List columns = new java.util.ArrayList();
     private List colWidths = new java.util.ArrayList();
-    
+
     private int maxColIndexReferenced = 0;
-    
+
     /**
      * Main Constructor.
      * @param table the table to construct this column setup for
@@ -57,7 +57,7 @@
         prepareColumns();
         initializeColumnWidths();
     }
-    
+
     private void prepareColumns() {
         List rawCols = table.getColumns();
         if (rawCols != null) {
@@ -124,7 +124,7 @@
             return (TableColumn) columns.get(index - 1);
         }
     }
- 
+
     /** {@inheritDoc} */
     public String toString() {
         return columns.toString();
@@ -138,15 +138,15 @@
             return columns.size();
         }
    }
-    
+
     /** @return an Iterator over all columns */
     public Iterator iterator() {
         return this.columns.iterator();
     }
-    
+
     /*
     private void createColumnsFromFirstRow() {
-        //TODO Create oldColumns from first row here 
+        //TODO Create oldColumns from first row here
         //--> rule 2 in "fixed table layout", see CSS2, 17.5.2
         //Alternative: extend oldColumns on-the-fly, but in this case we need the
         //new property evaluation context so proportional-column-width() works
@@ -159,13 +159,13 @@
 
     /**
      * Initializes the column's widths
-     * 
+     *
      */
     private void initializeColumnWidths() {
-        
+
         TableColumn col;
         Length colWidth;
-        
+
         for (int i = columns.size(); --i >= 0;) {
             if (columns.get(i) != null) {
                 col = (TableColumn) columns.get(i);
@@ -175,21 +175,21 @@
         }
         colWidths.add(0, null);
     }
-    
+
     /**
      * Works out the base unit for resolving proportional-column-width()
      * [p-c-w(x) = x * base_unit_ipd]
-     * 
+     *
      * @param tlm   the TableLayoutManager
      * @return the computed base unit (in millipoint)
      */
     protected double computeTableUnit(TableLayoutManager tlm) {
-        
+
         int sumCols = 0;
         float factors = 0;
         double unit = 0;
-        
-        /* calculate the total width (specified absolute/percentages), 
+
+        /* calculate the total width (specified absolute/percentages),
          * and work out the total number of factors to use to distribute
          * the remaining space (if any)
          */
@@ -204,9 +204,9 @@
                 }
             }
         }
-        
-        /* distribute the remaining space over the accumulated 
-         * factors (if any) 
+
+        /* distribute the remaining space over the accumulated
+         * factors (if any)
          */
         if (factors > 0) {
             if (sumCols < tlm.getContentAreaIPD()) {
@@ -215,10 +215,10 @@
                 log.warn("No space remaining to distribute over columns.");
             }
         }
-        
+
         return unit;
     }
-    
+
     /**
      * @param col column index (1 is first column)
      * @param context the context for percentage based calculations
@@ -258,5 +258,5 @@
         }
         return sum;
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -66,7 +66,7 @@
         int breakBefore = Constants.EN_AUTO;
         TableRow firstRow = rowGroup[0].getTableRow();
         if (firstRow != null) {
-            breakBefore = firstRow.getBreakBefore(); 
+            breakBefore = firstRow.getBreakBefore();
         }
         context.setBreakBefore(BreakUtil.compareBreakClasses(breakBefore,
                 rowGroup[0].getBreakBefore()));
@@ -74,7 +74,7 @@
         int breakAfter = Constants.EN_AUTO;
         TableRow lastRow = rowGroup[rowGroup.length - 1].getTableRow();
         if (lastRow != null) {
-            breakAfter = lastRow.getBreakAfter(); 
+            breakAfter = lastRow.getBreakAfter();
         }
         context.setBreakAfter(BreakUtil.compareBreakClasses(breakAfter,
                 rowGroup[rowGroup.length - 1].getBreakAfter()));
@@ -89,7 +89,7 @@
      * @param bodyType Indicates what kind of body is being processed (BODY, HEADER or FOOTER)
      * @param returnList List to received the generated elements
      */
-    private void createElementsForRowGroup(LayoutContext context, int alignment, 
+    private void createElementsForRowGroup(LayoutContext context, int alignment,
             int bodyType, LinkedList returnList) {
         log.debug("Handling row group with " + rowGroup.length + " rows...");
         EffRow row;
@@ -113,7 +113,7 @@
                     LayoutContext childLC = new LayoutContext(0);
                     childLC.setStackLimitBP(context.getStackLimitBP()); //necessary?
                     childLC.setRefIPD(spanWidth);
-                    
+
                     //Get the element list for the cell contents
                     List elems = primary.getCellLM().getNextKnuthElements(
                                             childLC, alignment);
@@ -131,7 +131,7 @@
     /**
      * Calculate the heights of the rows in the row group, see CSS21, 17.5.3 Table height
      * algorithms.
-     * 
+     *
      * TODO this method will need to be adapted once clarification has been made by the
      * W3C regarding whether borders or border-separation must be included or not
      */
@@ -174,7 +174,7 @@
                     int borderWidths = primary.getBeforeAfterBorderWidth();
                     int padding = 0;
                     CommonBorderPaddingBackground cbpb = primary.getCell()
-                            .getCommonBorderPaddingBackground(); 
+                            .getCommonBorderPaddingBackground();
                     padding += cbpb.getPaddingBefore(false, primary.getCellLM());
                     padding += cbpb.getPaddingAfter(false, primary.getCellLM());
                     int effRowHeight = effectiveCellBPD + padding + borderWidths;
@@ -195,13 +195,13 @@
 //            if (maxCellBPD > row.getExplicitHeight().max) {
 //old:
 //                log.warn(FONode.decorateWithContextInfo(
-//                        "The contents of row " + (row.getIndex() + 1) 
+//                        "The contents of row " + (row.getIndex() + 1)
 //                        + " are taller than they should be (there is a"
 //                        + " block-progression-dimension or height constraint
 //                        + " on the indicated row)."
 //                        + " Due to its contents the row grows"
 //                        + " to " + maxCellBPD + " millipoints, but the row shouldn't get"
-//                        + " any taller than " + row.getExplicitHeight() + " millipoints.", 
+//                        + " any taller than " + row.getExplicitHeight() + " millipoints.",
 //                        row.getTableRow()));
 //new (with events):
 //                BlockLevelEventProducer eventProducer = BlockLevelEventProducer.Factory.create(

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java Thu Jul 24 02:35:34 2008
@@ -107,7 +107,7 @@
 
     /**
      * Signals that the end of the current table part is reached.
-     * 
+     *
      * @param lastInBody true if the part is the last table-body element to be displayed
      * on the current page. In which case all the cells must be flushed even if they
      * aren't finished, plus the proper collapsed borders must be selected (trailing
@@ -118,7 +118,7 @@
      */
     void endTablePart(boolean lastInBody, boolean lastOnPage) {
         addAreasAndFlushRow(lastInBody, lastOnPage);
-    
+
         if (tablePartBackground != null) {
             TableLayoutManager tableLM = tclm.getTableLM();
             for (Iterator iter = tablePartBackgroundAreas.iterator(); iter.hasNext();) {
@@ -139,7 +139,7 @@
     /**
      * 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.
-     * 
+     *
      * @param tcpos a position representing the row fragment
      */
     void handleTableContentPosition(TableContentPosition tcpos) {
@@ -173,7 +173,7 @@
                 firstCellParts[colIndex] = cellPart;
                 cellHeights[colIndex] = cellPart.getBorderPaddingBefore(firstCellOnPage[colIndex]);
             } else {
-                assert firstCellParts[colIndex].pgu == cellPart.pgu; 
+                assert firstCellParts[colIndex].pgu == cellPart.pgu;
                 cellHeights[colIndex] += cellPart.getConditionalBeforeContentLength();
             }
             cellHeights[colIndex] += cellPart.getLength();
@@ -185,7 +185,7 @@
      * Creates the areas corresponding to the last row. That is, an area with background
      * for the row, plus areas for all the cells that finish on the row (not spanning over
      * further rows).
-     * 
+     *
      * @param lastInPart true if the row is the last from its table part to be displayed
      * on the current page. In which case all the cells must be flushed even if they
      * aren't finished, plus the proper collapsed borders must be selected (trailing
@@ -204,7 +204,7 @@
         // Need to compute the actual row height first
         int actualRowHeight = 0;
         for (int i = 0; i < colCount; i++) {
-            GridUnit currentGU = currentRow.getGridUnit(i);            
+            GridUnit currentGU = currentRow.getGridUnit(i);
             if (!currentGU.isEmpty() && currentGU.getColSpanIndex() == 0
                     && (lastInPart || currentGU.isLastGridUnitRowSpan())
                     && firstCellParts[i] != null) {
@@ -396,7 +396,7 @@
      * set when the areas for the cell are created since at that moment this bpd is yet
      * unknown. So they will instead be set in
      * {@link #addAreasAndFlushRow(boolean, boolean)}.
-     * 
+     *
      * @param backgroundArea the block of the cell's dimensions that will hold the part
      * background
      */
@@ -407,7 +407,7 @@
 
     /**
      * Records the y-offset of the row with the given index.
-     * 
+     *
      * @param rowIndex index of the row
      * @param offset y-offset of the row on the page
      */
@@ -419,7 +419,7 @@
          * considered as finished, since it contains no cell ending on this row. Thus no
          * TableContentPosition will be created for this row. Thus its index will never be
          * recorded by the #handleTableContentPosition method.
-         * 
+         *
          * The offset of such a row is the same as the next non-empty row. It's needed
          * to correctly offset blocks for cells starting on this row. Hence the loop
          * below.
@@ -431,7 +431,7 @@
 
     /**
      * Returns the offset of the row with the given index.
-     * 
+     *
      * @param rowIndex index of the row
      * @return its y-offset on the page
      */

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.layoutmgr.table;
 
 import org.apache.fop.area.Area;
@@ -55,7 +55,7 @@
     public TableAndCaption getTableAndCaptionFO() {
         return (TableAndCaption)this.fobj;
     }
-    
+
     /**
      * Get the next break possibility.
      *
@@ -199,7 +199,7 @@
             curBlockArea.addBlock((Block) childArea);
         }
     }
-    
+
     /** {@inheritDoc} */
     public int getKeepTogetherStrength() {
         int strength = KEEP_AUTO;
@@ -209,8 +209,8 @@
         */
         strength = Math.max(strength, getParentKeepTogetherStrength());
         return strength;
-    }    
-    
+    }
+
     /** {@inheritDoc} */
     public int getKeepWithNextStrength() {
         return KEEP_AUTO;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.layoutmgr.table;
 
 import org.apache.fop.area.Area;
@@ -50,7 +50,7 @@
     public TableCaption getTableCaptionFO() {
         return (TableCaption)this.fobj;
     }
-    
+
     /**
      * Get the next break position for the caption.
      *
@@ -195,7 +195,7 @@
                 curBlockArea.addBlock((Block) childArea);
         }
     }
-    
+
     /** {@inheritDoc} */
     public int getKeepTogetherStrength() {
         int strength = KEEP_AUTO;
@@ -208,7 +208,7 @@
         strength = Math.max(strength, getParentKeepTogetherStrength());
         return strength;
     }
-    
+
     /** {@inheritDoc} */
     public int getKeepWithNextStrength() {
         return KEEP_AUTO;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -240,7 +240,7 @@
     /**
      * Sets the total height of this cell on the current page. That is, the cell's bpd
      * plus before and after borders and paddings, plus the table's border-separation.
-     * 
+     *
      * @param h the height of cell
      */
     public void setTotalHeight(int h) {
@@ -250,12 +250,12 @@
     /**
      * Add the areas for the break points. The cell contains block stacking layout
      * managers that add block areas.
-     * 
+     *
      * <p>In the collapsing-border model, the borders of a cell that spans over several
      * rows or columns are drawn separately for each grid unit. Therefore we must know the
      * height of each grid row spanned over by the cell. Also, if the cell is broken over
      * two pages we must know which spanned grid rows are present on the current page.</p>
-     * 
+     *
      * @param parentIter the iterator of the break positions
      * @param layoutContext the layout context for adding the areas
      * @param spannedGridRowHeights in collapsing-border model for a spanning cell, height
@@ -296,7 +296,7 @@
 
         CommonBorderPaddingBackground padding = primaryGridUnit.getCell()
                 .getCommonBorderPaddingBackground();
-        int paddingRectBPD = totalHeight - borderBeforeWidth - borderAfterWidth; 
+        int paddingRectBPD = totalHeight - borderBeforeWidth - borderAfterWidth;
         int cellBPD = paddingRectBPD;
         cellBPD -= padding.getPaddingBefore(borderBeforeWhich == ConditionalBorder.REST, this);
         cellBPD -= padding.getPaddingAfter(borderAfterWhich == ConditionalBorder.REST, this);
@@ -488,7 +488,7 @@
         CommonBorderPaddingBackground padding = getTableCell().getCommonBorderPaddingBackground();
         int paddingStart = padding.getPaddingStart(false, this);
         int paddingEnd = padding.getPaddingEnd(false, this);
-        
+
         Block block = new Block();
         TraitSetter.setProducerID(block, getTable().getId());
         block.setPositioning(Block.ABSOLUTE);
@@ -567,7 +567,7 @@
         strength = Math.max(strength, getParentKeepTogetherStrength());
         return strength;
     }
-    
+
     /** {@inheritDoc} */
     public int getKeepWithNextStrength() {
         return KEEP_AUTO; //TODO FIX ME (table-cell has no keep-with-next!)

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java Thu Jul 24 02:35:34 2008
@@ -69,9 +69,9 @@
 
     private int startXOffset;
     private int usedBPD;
-    
+
     private TableStepper stepper;
-        
+
     /**
      * Main constructor
      * @param parent Parent layout manager
@@ -88,19 +88,19 @@
         }
         stepper = new TableStepper(this);
     }
-    
+
     /**
      * @return the table layout manager
      */
     TableLayoutManager getTableLM() {
         return this.tableLM;
     }
-    
+
     /** @return true if the table uses the separate border model. */
     boolean isSeparateBorderModel() {
         return getTableLM().getTable().isSeparateBorderModel();
     }
-    
+
     /**
      * @return the column setup of this table
      */
@@ -142,14 +142,14 @@
             this.headerNetHeight
                     = ElementListUtils.calcContentLength(this.headerList);
             if (log.isDebugEnabled()) {
-                log.debug("==> Header: " 
+                log.debug("==> Header: "
                         + headerNetHeight + " - " + this.headerList);
             }
             TableHeaderFooterPosition pos = new TableHeaderFooterPosition(
                     getTableLM(), true, this.headerList);
             KnuthBox box = new KnuthBox(headerNetHeight, pos, false);
             if (getTableLM().getTable().omitHeaderAtBreak()) {
-                //We can simply add the table header at the start 
+                //We can simply add the table header at the start
                 //of the whole list
                 headerAsFirst = box;
             } else {
@@ -162,7 +162,7 @@
             this.footerNetHeight
                     = ElementListUtils.calcContentLength(this.footerList);
             if (log.isDebugEnabled()) {
-                log.debug("==> Footer: " 
+                log.debug("==> Footer: "
                         + footerNetHeight + " - " + this.footerList);
             }
             //We can simply add the table footer at the end of the whole list
@@ -195,17 +195,17 @@
         }
         return returnList;
     }
-    
+
     /**
      * Creates Knuth elements by iterating over a TableRowIterator.
      * @param iter TableRowIterator instance to fetch rows from
      * @param context Active LayoutContext
      * @param alignment alignment indicator
-     * @param bodyType Indicates what kind of body is being processed 
+     * @param bodyType Indicates what kind of body is being processed
      *                  (BODY, HEADER or FOOTER)
      * @return An element list
      */
-    private LinkedList getKnuthElementsForRowIterator(TableRowIterator iter, 
+    private LinkedList getKnuthElementsForRowIterator(TableRowIterator iter,
             LayoutContext context, int alignment, int bodyType) {
         LinkedList returnList = new LinkedList();
         EffRow[] rowGroup = iter.getNextRowGroup();
@@ -225,12 +225,12 @@
             returnList.addAll(nextRowGroupElems);
             while ((rowGroup = iter.getNextRowGroup()) != null) {
                 rowGroupLM = new RowGroupLayoutManager(getTableLM(), rowGroup, stepper);
-                
+
                 //Note previous pending keep-with-next and clear the strength
                 //(as the layout context is reused)
                 int keepWithNextPending = context.getKeepWithNextPending();
                 context.clearKeepWithNextPending();
-                
+
                 //Get elements for next row group
                 nextRowGroupElems = rowGroupLM.getNextKnuthElements(context, alignment, bodyType);
                 /*
@@ -238,13 +238,13 @@
                  * group) may be used to represent the break between the two row groups.
                  * Its penalty value and break class must just be overridden by the
                  * characteristics of the keep or break between the two.
-                 * 
+                 *
                  * However, we mustn't forget that if the after border of the last row of
                  * the row group is thicker in the normal case than in the trailing case,
                  * an additional glue will be appended to the element list. So we may have
                  * to go two steps backwards in the list.
                  */
-                
+
                 //Determine keep constraints
                 int penaltyStrength = BlockLevelLayoutManager.KEEP_AUTO;
                 penaltyStrength = Math.max(penaltyStrength, keepWithNextPending);
@@ -252,7 +252,7 @@
                 context.clearKeepWithPreviousPending();
                 penaltyStrength = Math.max(penaltyStrength, getTableLM().getKeepTogetherStrength());
                 int penaltyValue = KeepUtil.getPenaltyForKeep(penaltyStrength);
-                
+
                 breakBetween = BreakUtil.compareBreakClasses(breakBetween,
                         context.getBreakBefore());
                 if (breakBetween != Constants.EN_AUTO) {
@@ -291,16 +291,16 @@
         context.setBreakBefore(breakBefore);
 
         //fox:widow-content-limit
-        int widowContentLimit = getTableLM().getTable().getWidowContentLimit().getValue(); 
+        int widowContentLimit = getTableLM().getTable().getWidowContentLimit().getValue();
         if (widowContentLimit != 0 && bodyType == TableRowIterator.BODY) {
             ElementListUtils.removeLegalBreaks(returnList, widowContentLimit);
         }
         //fox:orphan-content-limit
-        int orphanContentLimit = getTableLM().getTable().getOrphanContentLimit().getValue(); 
+        int orphanContentLimit = getTableLM().getTable().getOrphanContentLimit().getValue();
         if (orphanContentLimit != 0 && bodyType == TableRowIterator.BODY) {
             ElementListUtils.removeLegalBreaksFromEnd(returnList, orphanContentLimit);
         }
-        
+
         return returnList;
     }
 
@@ -313,7 +313,7 @@
         int col = gu.getColIndex();
         return startXOffset + getTableLM().getColumns().getXOffset(col + 1, getTableLM());
     }
-    
+
     /**
      * Adds the areas generated by this layout manager to the area tree.
      * @param parentIter the position iterator
@@ -358,7 +358,7 @@
                 }
             } else if (pos instanceof TableHFPenaltyPosition) {
                 //ignore for now, see special handling below if break is at a penalty
-                //Only if the last position in this part/page us such a position it will be used 
+                //Only if the last position in this part/page us such a position it will be used
             } else if (pos instanceof TableContentPosition) {
                 tablePositions.add(pos);
             } else {
@@ -376,23 +376,23 @@
                 headerElements = penaltyPos.headerElements;
             }
             if (penaltyPos.footerElements != null) {
-                footerElements = penaltyPos.footerElements; 
+                footerElements = penaltyPos.footerElements;
             }
         }
 
         Map markers = getTableLM().getTable().getMarkers();
         if (markers != null) {
-            getTableLM().getCurrentPV().addMarkers(markers, 
+            getTableLM().getCurrentPV().addMarkers(markers,
                     true, getTableLM().isFirst(firstPos), getTableLM().isLast(lastCheckPos));
         }
-        
+
         if (headerElements != null) {
             //header positions for the last part are the second-to-last element and need to
             //be handled first before all other TableContentPositions
             addHeaderFooterAreas(headerElements, tableLM.getTable().getTableHeader(), painter,
                     false);
         }
-        
+
         if (tablePositions.isEmpty()) {
             // TODO make sure this actually never happens
             log.error("tablePositions empty."
@@ -407,11 +407,11 @@
             addHeaderFooterAreas(footerElements, tableLM.getTable().getTableFooter(), painter,
                     true);
         }
-        
+
         this.usedBPD += painter.getAccumulatedBPD();
 
         if (markers != null) {
-            getTableLM().getCurrentPV().addMarkers(markers, 
+            getTableLM().getCurrentPV().addMarkers(markers,
                     false, getTableLM().isFirst(firstPos), getTableLM().isLast(lastCheckPos));
         }
     }
@@ -435,7 +435,7 @@
     /**
      * Iterates over the positions corresponding to the table's body (which may contain
      * several table-body elements!) and adds the corresponding areas.
-     * 
+     *
      * @param iterator iterator over TableContentPosition elements. Those positions
      * correspond to the elements of the body present on the current page
      * @param painter
@@ -472,13 +472,13 @@
      */
     private void addTablePartAreas(List positions, RowPainter painter, TablePart body,
             boolean isFirstPos, boolean isLastPos, boolean lastInBody, boolean lastOnPage) {
-        getTableLM().getCurrentPV().addMarkers(body.getMarkers(), 
+        getTableLM().getCurrentPV().addMarkers(body.getMarkers(),
                 true, isFirstPos, isLastPos);
         painter.startTablePart(body);
         for (Iterator iter = positions.iterator(); iter.hasNext();) {
             painter.handleTableContentPosition((TableContentPosition) iter.next());
         }
-        getTableLM().getCurrentPV().addMarkers(body.getMarkers(), 
+        getTableLM().getCurrentPV().addMarkers(body.getMarkers(),
                 false, isFirstPos, isLastPos);
         painter.endTablePart(lastInBody, lastOnPage);
     }
@@ -501,7 +501,7 @@
     // --------- Property Resolution related functions --------- //
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public int getBaseLength(int lengthBase, FObj fobj) {
         return tableLM.getBaseLength(lengthBase, fobj);

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentPosition.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentPosition.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentPosition.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentPosition.java Thu Jul 24 02:35:34 2008
@@ -64,7 +64,7 @@
      * Sets the row corresponding to this position if it starts a new page. In which case,
      * if the delay mechanism is on, this is the delayed row that starts the page, and not
      * the current row being extended.
-     * 
+     *
      * @param newPageRow the row that will start the page if this position is the first
      * one on that page
      */

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java Thu Jul 24 02:35:34 2008
@@ -59,15 +59,15 @@
  * The table then creates areas for the columns, bodies and rows
  * the render background.
  */
-public class TableLayoutManager extends BlockStackingLayoutManager 
+public class TableLayoutManager extends BlockStackingLayoutManager
                 implements ConditionalElementListener {
 
     /**
      * logging instance
      */
     private static Log log = LogFactory.getLog(TableLayoutManager.class);
-    
-    private TableContentLayoutManager contentLM; 
+
+    private TableContentLayoutManager contentLM;
     private ColumnSetup columns = null;
 
     private Block curBlockArea;
@@ -81,7 +81,7 @@
     private boolean discardPaddingAfter;
     private MinOptMax effSpaceBefore;
     private MinOptMax effSpaceAfter;
-    
+
     private int halfBorderSeparationBPD;
     private int halfBorderSeparationIPD;
 
@@ -90,7 +90,7 @@
 
     /**
      * Temporary holder of column background informations for a table-cell's area.
-     * 
+     *
      * @see TableLayoutManager#registerColumnBackgroundArea(TableColumn, Block, int)
      */
     private static final class ColumnBackgroundInfo {
@@ -118,14 +118,14 @@
     public Table getTable() {
         return (Table)this.fobj;
     }
-    
+
     /**
      * @return the column setup for this table.
      */
     public ColumnSetup getColumns() {
         return this.columns;
     }
-    
+
     /** {@inheritDoc} */
     public void initialize() {
         foSpaceBefore = new SpaceVal(
@@ -133,8 +133,8 @@
         foSpaceAfter = new SpaceVal(
                 getTable().getCommonMarginBlock().spaceAfter, this).getSpace();
         startIndent = getTable().getCommonMarginBlock().startIndent.getValue(this);
-        endIndent = getTable().getCommonMarginBlock().endIndent.getValue(this); 
-        
+        endIndent = getTable().getCommonMarginBlock().endIndent.getValue(this);
+
         if (getTable().isSeparateBorderModel()) {
             this.halfBorderSeparationBPD = getTable().getBorderSeparation().getBPD().getLength()
                     .getValue(this) / 2;
@@ -144,23 +144,23 @@
             this.halfBorderSeparationBPD = 0;
             this.halfBorderSeparationIPD = 0;
         }
-        
-        if (!getTable().isAutoLayout() 
-                && getTable().getInlineProgressionDimension().getOptimum(this).getEnum() 
+
+        if (!getTable().isAutoLayout()
+                && getTable().getInlineProgressionDimension().getOptimum(this).getEnum()
                     != EN_AUTO) {
             autoLayout = false;
         }
     }
 
     private void resetSpaces() {
-        this.discardBorderBefore = false;        
-        this.discardBorderAfter = false;        
-        this.discardPaddingBefore = false;        
+        this.discardBorderBefore = false;
+        this.discardBorderAfter = false;
+        this.discardPaddingBefore = false;
         this.discardPaddingAfter = false;
         this.effSpaceBefore = null;
         this.effSpaceAfter = null;
     }
-    
+
     /**
      * @return half the value of border-separation.block-progression-dimension, or 0 if
      * border-collapse="collapse".
@@ -179,7 +179,7 @@
 
     /** {@inheritDoc} */
     public List getNextKnuthElements(LayoutContext context, int alignment) {
-        
+
         List returnList = new LinkedList();
 
         /*
@@ -201,7 +201,7 @@
         int sumOfColumns = columns.getSumOfColumnWidths(this);
         if (!autoLayout && sumOfColumns > getContentAreaIPD()) {
             log.debug(FONode.decorateWithContextInfo(
-                    "The sum of all column widths is larger than the specified table width.", 
+                    "The sum of all column widths is larger than the specified table width.",
                     getTable()));
             updateContentAreaIPDwithOverconstrainedAdjust(sumOfColumns);
         }
@@ -213,7 +213,7 @@
                     getContentAreaIPD(), context.getRefIPD(),
                     getTable().getLocator());
         }
-        
+
         /* initialize unit to determine computed values
          * for proportional-column-width()
          */
@@ -224,7 +224,7 @@
         if (!firstVisibleMarkServed) {
             addKnuthElementsForSpaceBefore(returnList, alignment);
         }
-        
+
         if (getTable().isSeparateBorderModel()) {
             addKnuthElementsForBorderPaddingBefore(returnList, !firstVisibleMarkServed);
             firstVisibleMarkServed = true;
@@ -279,7 +279,7 @@
         int breakAfter = BreakUtil.compareBreakClasses(getTable().getBreakAfter(),
                 childLC.getBreakAfter());
         if (breakAfter != Constants.EN_AUTO) {
-            returnList.add(new BreakElement(getAuxiliaryPosition(), 
+            returnList.add(new BreakElement(getAuxiliaryPosition(),
                     0, -KnuthElement.INFINITE, breakAfter, context));
         }
 
@@ -295,7 +295,7 @@
      * be known. The traits can't then be set when the areas for the cell are created
      * since at that moment this bpd is yet unknown. So they will instead be set in
      * TableLM's {@link #addAreas(PositionIterator, LayoutContext)} method.
-     * 
+     *
      * @param column the table-column element from which the cell gets background
      * informations
      * @param backgroundArea the block of the cell's dimensions that will hold the column
@@ -329,7 +329,7 @@
         }
 
         int startXOffset = getTable().getCommonMarginBlock().startIndent.getValue(this);
-        
+
         // add column, body then row areas
 
         // BPD of the table, i.e., height of its content; table's borders and paddings not counted
@@ -357,30 +357,30 @@
         }
 
         if (getTable().isSeparateBorderModel()) {
-            TraitSetter.addBorders(curBlockArea, 
-                    getTable().getCommonBorderPaddingBackground(), 
+            TraitSetter.addBorders(curBlockArea,
+                    getTable().getCommonBorderPaddingBackground(),
                     discardBorderBefore, discardBorderAfter, false, false, this);
-            TraitSetter.addPadding(curBlockArea, 
-                    getTable().getCommonBorderPaddingBackground(), 
+            TraitSetter.addPadding(curBlockArea,
+                    getTable().getCommonBorderPaddingBackground(),
                     discardPaddingBefore, discardPaddingAfter, false, false, this);
         }
-        TraitSetter.addBackground(curBlockArea, 
+        TraitSetter.addBackground(curBlockArea,
                 getTable().getCommonBorderPaddingBackground(),
                 this);
         TraitSetter.addMargins(curBlockArea,
-                getTable().getCommonBorderPaddingBackground(), 
+                getTable().getCommonBorderPaddingBackground(),
                 startIndent, endIndent,
                 this);
-        TraitSetter.addBreaks(curBlockArea, 
+        TraitSetter.addBreaks(curBlockArea,
                 getTable().getBreakBefore(), getTable().getBreakAfter());
-        TraitSetter.addSpaceBeforeAfter(curBlockArea, layoutContext.getSpaceAdjust(), 
+        TraitSetter.addSpaceBeforeAfter(curBlockArea, layoutContext.getSpaceAdjust(),
                 effSpaceBefore, effSpaceAfter);
 
         flush();
 
         resetSpaces();
         curBlockArea = null;
-        
+
         notifyEndOfLayout();
     }
 
@@ -403,11 +403,11 @@
             // Set up dimensions
             // Must get dimensions from parent area
             /*Area parentArea =*/ parentLM.getParentArea(curBlockArea);
-            
+
             TraitSetter.setProducerID(curBlockArea, getTable().getId());
 
             curBlockArea.setIPD(getContentAreaIPD());
-            
+
             setCurrentArea(curBlockArea);
         }
         return curBlockArea;
@@ -426,7 +426,7 @@
 
     /**
      * Adds the given area to this layout manager's area, without updating the used bpd.
-     * 
+     *
      * @param background an area
      */
     void addBackgroundArea(Block background) {
@@ -442,7 +442,7 @@
     /** {@inheritDoc} */
     public void discardSpace(KnuthGlue spaceGlue) {
         // TODO Auto-generated method stub
-        
+
     }
 
     /** {@inheritDoc} */
@@ -451,7 +451,7 @@
         strength = Math.max(strength, getParentKeepTogetherStrength());
         return strength;
     }
-    
+
     /** {@inheritDoc} */
     public int getKeepWithNextStrength() {
         return KeepUtil.getCombinedBlockLevelKeepStrength(getTable().getKeepWithNext());
@@ -465,7 +465,7 @@
     // --------- Property Resolution related functions --------- //
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public int getBaseLength(int lengthBase, FObj fobj) {
         // Special handler for TableColumn width specifications
@@ -488,18 +488,18 @@
             }
         }
     }
-    
+
     /** {@inheritDoc} */
     public void notifySpace(RelSide side, MinOptMax effectiveLength) {
         if (RelSide.BEFORE == side) {
             if (log.isDebugEnabled()) {
-                log.debug(this + ": Space " + side + ", " 
+                log.debug(this + ": Space " + side + ", "
                         + this.effSpaceBefore + "-> " + effectiveLength);
             }
             this.effSpaceBefore = effectiveLength;
         } else {
             if (log.isDebugEnabled()) {
-                log.debug(this + ": Space " + side + ", " 
+                log.debug(this + ": Space " + side + ", "
                         + this.effSpaceAfter + "-> " + effectiveLength);
             }
             this.effSpaceAfter = effectiveLength;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java Thu Jul 24 02:35:34 2008
@@ -83,7 +83,7 @@
     /**
      * Flag used to produce an infinite penalty if the height of the current row is
      * smaller than the first step for that row (may happen with row-spanning cells).
-     * 
+     *
      * @see #considerRowLastStep(int)
      */
     private boolean rowHeightSmallerThanFirstStep;
@@ -107,7 +107,7 @@
 
     /**
      * Initializes the fields of this instance to handle a new row group.
-     * 
+     *
      * @param rows the new row group to handle
      */
     private void setup(EffRow[] rows) {
@@ -151,7 +151,7 @@
 
     /**
      * Creates ActiveCell instances for cells starting on the row at the given index.
-     * 
+     *
      * @param activeCellList the list that will hold the active cells
      * @param rowIndex the index of the row from which cells must be activated
      */
@@ -289,7 +289,7 @@
 
     /**
      * Returns the first step for the current row group.
-     * 
+     *
      * @return the first step for the current row group
      */
     private int getFirstStep() {
@@ -302,7 +302,7 @@
 
     /**
      * Returns the next break possibility.
-     * 
+     *
      * @return the next step
      */
     private int getNextStep() {
@@ -342,7 +342,7 @@
     /**
      * Computes the minimal necessary step to make the next row fit. That is, so such as
      * cell on the next row can contribute some content.
-     * 
+     *
      * @param cells the cells occupying the next row (may include cells starting on
      * previous rows and spanning over this one)
      */
@@ -355,7 +355,7 @@
 
     /**
      * Computes the next minimal step.
-     * 
+     *
      * @return the minimal step from the active cells, &lt; 0 if there is no such step
      */
     private int computeMinStep() {
@@ -379,7 +379,7 @@
     /**
      * Signals the first step to the active cells, to allow them to add more content to
      * the step if possible.
-     * 
+     *
      * @see ActiveCell#signalRowFirstStep(int)
      */
     private void signalRowFirstStep() {
@@ -391,7 +391,7 @@
 
     /**
      * Signals the next selected step to the active cells.
-     *  
+     *
      * @param step the next step
      */
     private void signalNextStep(int step) {
@@ -416,7 +416,7 @@
      * infinite penalty for this step. This will prevent the breaking algorithm from
      * choosing this break, but still allow to create the appropriate TableContentPosition
      * for the cells ending on the current row.</p>
-     * 
+     *
      * @param step the next step
      * @return the updated step if any
      */
@@ -445,7 +445,7 @@
             }
             for (Iterator iter = activeCells.iterator(); iter.hasNext();) {
                 ActiveCell activeCell = (ActiveCell) iter.next();
-                activeCell.endRow(activeRowIndex);                        
+                activeCell.endRow(activeRowIndex);
                 if (!activeCell.endsOnRow(activeRowIndex)) {
                     activeCell.signalRowLastStep(maxStep);
                 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/ASCII85Filter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/ASCII85Filter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/ASCII85Filter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/ASCII85Filter.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.OutputStream;
@@ -46,7 +46,7 @@
     public boolean isASCIIFilter() {
         return true;
     }
-    
+
     /**
      * Get the decode parameters.
      *

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/ASCIIHexFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/ASCIIHexFilter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/ASCIIHexFilter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/ASCIIHexFilter.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.OutputStream;
@@ -29,7 +29,7 @@
  * This filter converts a pdf stream to ASCII hex data.
  */
 public class ASCIIHexFilter extends PDFFilter {
-    
+
     /**
      * Get the name of this filter.
      *
@@ -45,7 +45,7 @@
     public boolean isASCIIFilter() {
         return true;
     }
-    
+
     /**
      * Get the decode params.
      *

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
@@ -43,13 +43,13 @@
     }
 
     /**
-     * Sets up the default filters for this stream if they haven't been set 
+     * Sets up the default filters for this stream if they haven't been set
      * from outside.
      */
     protected void setupFilterList() {
         if (!getFilterList().isInitialized()) {
             getFilterList().addDefaultFilters(
-                getDocumentSafely().getFilterMap(), 
+                getDocumentSafely().getFilterMap(),
                 PDFFilterList.DEFAULT_FILTER);
         }
         prepareImplicitFilters();
@@ -78,18 +78,18 @@
     /**
      * Returns a value that hints at the size of the encoded stream. This is
      * used to optimize buffer allocation so fewer buffer reallocations are
-     * necessary. 
+     * necessary.
      * @return an estimated size (0 if no hint can be given)
      * @throws IOException in case of an I/O problem
      */
     protected abstract int getSizeHint() throws IOException;
-    
+
     /**
      * Sends the raw stream data to the target OutputStream.
      * @param out OutputStream to write to
      * @throws IOException In case of an I/O problem
      */
-    protected abstract void outputRawStreamData(OutputStream out) 
+    protected abstract void outputRawStreamData(OutputStream out)
             throws IOException;
 
     /**
@@ -104,10 +104,10 @@
         byte[] p = encode("stream\n");
         out.write(p);
         length += p.length;
-        
+
         encodedStream.outputContents(out);
         length += encodedStream.getSize();
-        
+
         p = encode("\nendstream");
         out.write(p);
         length += p.length;
@@ -147,7 +147,7 @@
         byte[] buf = encode("stream\n");
         out.write(buf);
         bytesWritten += buf.length;
-        
+
         //Stream contents
         CloseBlockerOutputStream cbout = new CloseBlockerOutputStream(out);
         CountingOutputStream cout = new CountingOutputStream(cbout);
@@ -156,12 +156,12 @@
         filteredOutput.close();
         refLength.setNumber(new Integer(cout.getCount()));
         bytesWritten += cout.getCount();
-            
+
         //Stream trailer
         buf = encode("\nendstream");
         out.write(buf);
         bytesWritten += buf.length;
-        
+
         return bytesWritten;
     }
 
@@ -177,7 +177,7 @@
         Writer writer = PDFDocument.getWriterFor(cout);
         writer.write(getObjectID());
         //int length = 0;
-        
+
         StreamCache encodedStream = null;
         PDFNumber refLength = null;
         final Object lengthEntry;
@@ -189,10 +189,10 @@
             encodedStream = encodeStream();
             lengthEntry = new Integer(encodedStream.getSize() + 1);
         }
-        
+
         populateStreamDict(lengthEntry);
         writeDictionary(cout, writer);
-        
+
         //Send encoded stream to target OutputStream
         writer.flush();
         if (encodedStream == null) {
@@ -201,7 +201,7 @@
             outputStreamData(encodedStream, cout);
             encodedStream.clear(); //Encoded stream can now be discarded
         }
-        
+
         writer.write("\nendobj\n");
         writer.flush();
         return cout.getCount();

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AlphaRasterImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AlphaRasterImage.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AlphaRasterImage.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AlphaRasterImage.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.awt.image.DataBuffer;
@@ -33,7 +33,7 @@
  * PDFImage implementation for alpha channel "images".
  */
 public class AlphaRasterImage implements PDFImage {
-    
+
     private int bitsPerComponent;
     private PDFDeviceColorSpace colorSpace;
     private Raster alpha;
@@ -117,7 +117,7 @@
     public String getSoftMask() {
         return null;
     }
-    
+
     /** {@inheritDoc} */
     public PDFReference getSoftMaskReference() {
         return null;
@@ -127,12 +127,12 @@
     public boolean isInverted() {
         return false;
     }
-    
+
     /** {@inheritDoc} */
     public void outputContents(OutputStream out) throws IOException {
         int w = getWidth();
         int h = getHeight();
-        
+
         //Check Raster
         int nbands = alpha.getNumBands();
         if (nbands != 1) {
@@ -171,7 +171,7 @@
         }
 
     }
-    
+
     /** {@inheritDoc} */
     public void populateXObjectDictionary(PDFDictionary dict) {
         //nop

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/BitmapImage.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
@@ -170,12 +170,12 @@
     public boolean isInverted() {
         return false;
     }
-    
+
     /** {@inheritDoc} */
     public void outputContents(OutputStream out) throws IOException {
         out.write(bitmaps);
     }
-    
+
     /** {@inheritDoc} */
     public void populateXObjectDictionary(PDFDictionary dict) {
         //nop

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CCFFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CCFFilter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CCFFilter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CCFFilter.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CMapBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CMapBuilder.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CMapBuilder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/CMapBuilder.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,22 +16,22 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;
 import java.io.Writer;
 
 public class CMapBuilder {
-    
+
     protected String name;
     protected Writer writer;
-    
+
     public CMapBuilder(Writer writer, String name) {
         this.writer = writer;
         this.name = name;
     }
-    
+
     /**
      * Writes the CMap to a Writer.
      * @throws IOException if an I/O error occurs
@@ -51,7 +51,7 @@
         writeStreamAfterComments();
         writeUseCMap();
     }
-    
+
     protected void writePreStream() throws IOException {
         // writer.write("/Type /CMap\n");
         // writer.write(sysInfo.toPDFString());
@@ -86,7 +86,7 @@
         writer.write(" def\n");
         writer.write("end def\n");
     }
-    
+
     protected void writeCIDSystemInfo() throws IOException {
         writeCIDSystemInfo("Adobe", "Identity", 0);
     }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/DCTFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/DCTFilter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/DCTFilter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/DCTFilter.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/FlateFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/FlateFilter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/FlateFilter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/FlateFilter.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/InMemoryStreamCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/InMemoryStreamCache.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/InMemoryStreamCache.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/InMemoryStreamCache.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.ByteArrayOutputStream;
@@ -72,7 +72,7 @@
     public void write(byte[] data) throws IOException {
         getOutputStream().write(data);
     }
-    
+
     /**
      * Outputs the cached bytes to the given stream.
      * @param out the output stream to write to

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/NullFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/NullFilter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/NullFilter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/NullFilter.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 import java.io.IOException;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAMode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAMode.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAMode.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAMode.java Thu Jul 24 02:35:34 2008
@@ -28,7 +28,7 @@
     public static final PDFAMode PDFA_1A = new PDFAMode("PDF/A-1a");
     /** PDF/A-1b enabled */
     public static final PDFAMode PDFA_1B = new PDFAMode("PDF/A-1b");
-    
+
     private String name;
 
     /**
@@ -43,13 +43,13 @@
     public String getName() {
         return this.name;
     }
-    
+
     /** @return true if this mode obey the restrictions established by PDF/A-1b. */
     public boolean isPDFA1LevelB() {
         return (this != DISABLED);
         //PDF/A-1a is a superset of PDF/A-1b!
     }
-    
+
     /**
      * Returns the mode enum object given a String.
      * @param s the string
@@ -64,10 +64,10 @@
             return DISABLED;
         }
     }
-    
+
     /** {@inheritDoc} */
     public String toString() {
         return name;
     }
-    
+
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAction.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAction.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 /**

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAnnotList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAnnotList.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAnnotList.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFAnnotList.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.pdf;
 
 // Java



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message