svn commit: r611265 - in /xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr: BlockContainerLayoutManager.java SpaceResolver.java

[spepping]

Author: spepping
Date: Fri Jan 11 11:05:47 2008
New Revision: 611265

URL: http://svn.apache.org/viewvc?rev=611265&view=rev
Log:
Small fix in space resolution: set first = false in appropriate cases

Modified:
    
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
    
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceResolver.java

Modified: 
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=611265&r1=611264&r2=611265&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
 Fri Jan 11 11:05:47 2008
@@ -615,7 +615,6 @@
                     bclm.wrapPositionElements(returnedList, returnList);
                 }
             }
-            SpaceResolver.resolveElementList(returnList);
             setFinished(true);
             return returnList;
         }

Modified: 
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceResolver.java?rev=611265&r1=611264&r2=611265&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
 Fri Jan 11 11:05:47 2008
@@ -19,7 +19,6 @@
 
 package org.apache.fop.layoutmgr;
 
-import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
@@ -620,7 +619,7 @@
         if (log.isTraceEnabled()) {
             log.trace(elems);
         }
-        boolean first = true;
+        boolean first = (startIndex == 0);
         boolean last = false;
         boolean skipNextElement = false;
         List unresolvedFirst = new java.util.ArrayList();
@@ -631,6 +630,7 @@
             ListElement el = (ListElement)iter.next();
             if (!el.isUnresolvedElement()) {
                 if (doall) {
+                    first = false;
                     continue;
                 } else {
                     break;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]