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 je...@apache.org on 2005/05/17 18:47:23 UTC

cvs commit: xml-fop/src/java/org/apache/fop/area Span.java

jeremias    2005/05/17 09:47:23

  Modified:    src/java/org/apache/fop/area Span.java
  Log:
  Bugfix for flow IPD not being set correctly.
  
  Revision  Changes    Path
  1.9       +6 -8      xml-fop/src/java/org/apache/fop/area/Span.java
  
  Index: Span.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Span.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Span.java	14 May 2005 16:41:45 -0000	1.8
  +++ Span.java	17 May 2005 16:47:23 -0000	1.9
  @@ -60,9 +60,8 @@
           flowAreas = new java.util.ArrayList(colCount);        
           colWidth = (ipd - ((colCount - 1) * colGap)) / colCount;
   
  -        for (int i=0; i< colCount; i++) {
  +        for (int i = 0; i < colCount; i++) {
               NormalFlow newFlow = new NormalFlow(colWidth);
  -            newFlow.setIPD(getIPD());
               flowAreas.add(newFlow);
           }
       }
  @@ -105,9 +104,9 @@
           if (colRequested >= 0 && colRequested < colCount) {
               return (NormalFlow) flowAreas.get(colRequested);
           } else { // internal error
  -            throw new IllegalArgumentException("Invalid column number " + 
  -                    colRequested + " requested; only 0-" + (colCount-1) +
  -                    " available.");
  +            throw new IllegalArgumentException("Invalid column number " 
  +                    + colRequested + " requested; only 0-" + (colCount - 1) 
  +                    + " available.");
           }
       }
       
  @@ -131,8 +130,7 @@
               curFlowIdx++;
               return getNormalFlow(curFlowIdx);
           } else {
  -            throw new IllegalStateException("(Internal error.)" +
  -                    " No more flows left in span.");
  +            throw new IllegalStateException("(Internal error.) No more flows left in span.");
           }
       }
       
  @@ -143,7 +141,7 @@
        * false otherwise.
        */
       public boolean hasMoreFlows() {
  -        return (curFlowIdx < colCount-1); 
  +        return (curFlowIdx < colCount - 1); 
       }
   }
   
  
  
  

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