cvs commit: xml-fop/src/org/apache/fop/layoutmgr/list Item.java ListItemLayoutManager.java

[keiron]

keiron      2002/11/18 23:00:27

  Modified:    src/org/apache/fop/layoutmgr/list Item.java
                        ListItemLayoutManager.java
  Log:
  correctly continue lists over page
  
  Revision  Changes    Path
  1.5       +3 -1      xml-fop/src/org/apache/fop/layoutmgr/list/Item.java
  
  Index: Item.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/list/Item.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Item.java 18 Nov 2002 15:54:15 -0000      1.4
  +++ Item.java 19 Nov 2002 07:00:27 -0000      1.5
  @@ -102,6 +102,7 @@
                           } else {
                               curLM.resetPosition(null);
                           }
  +                        over = true;
                           break;
                       }
                       stackSize.add(bp.getStackingSize());
  @@ -234,6 +235,7 @@
           if (resetPos == null) {
               reset(null);
           } else {
  +            setFinished(false);
               //reset(resetPos);
           }
       }
  
  
  
  1.5       +7 -4      
xml-fop/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
  
  Index: ListItemLayoutManager.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ListItemLayoutManager.java        18 Nov 2002 15:54:15 -0000      1.4
  +++ ListItemLayoutManager.java        19 Nov 2002 07:00:27 -0000      1.5
  @@ -35,10 +35,9 @@
       private Item label;
       private Item body;
   
  -    private Block curBlockArea;
  +    private Block curBlockArea = null;
   
       private List cellList = null;
  -    private List columns = null;
       private int listItemHeight;
       private BorderAndPadding borderProps = null;
       private BackgroundProps backgroundProps;
  @@ -171,7 +170,10 @@
   
           MinOptMax itemSize = new MinOptMax(min, opt, max);
   
  -        setFinished(true);
  +        if (label.isFinished() && body.isFinished()) {
  +            setFinished(true);
  +        }
  +
           ItemPosition rp = new ItemPosition(this, breakList.size() - 1, breakList);
           BreakPoss breakPoss = new BreakPoss(rp);
           if (over) { 
  @@ -217,6 +219,7 @@
   
           flush();
   
  +        curBlockArea = null;
       }
   
       /**
  
  
  

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