vmote       2003/08/26 07:35:42

  Modified:    src/java/org/apache/fop/fo/flow ListItemLabel.java
               src/java/org/apache/fop/layoutmgr AddLMVisitor.java
  Log:
  move fo/flow/ListItemLabel.getItemLayoutManager() to 
layoutmgr/AddLMVisitor.getListItemLabelLayoutManager()
  
  Revision  Changes    Path
  1.7       +0 -11     xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java
  
  Index: ListItemLabel.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemLabel.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ListItemLabel.java        22 Aug 2003 17:42:41 -0000      1.6
  +++ ListItemLabel.java        26 Aug 2003 14:35:42 -0000      1.7
  @@ -56,7 +56,6 @@
   import org.apache.fop.fo.FOTreeVisitor;
   import org.apache.fop.fo.properties.CommonAccessibility;
   import org.apache.fop.layoutmgr.list.Item;
  -import org.apache.fop.apps.*;
   
   /**
    * Class modelling the fo:list-item-label object. See Sec. 6.8.5 of the XSL-FO
  @@ -69,16 +68,6 @@
        */
       public ListItemLabel(FONode parent) {
           super(parent);
  -    }
  -
  -    /**
  -     * @return this object's Item layout manager
  -     */
  -    public Item getItemLayoutManager() {
  -        Item itemLabel = new Item();
  -        itemLabel.setUserAgent(getUserAgent());
  -        itemLabel.setFObj(this);
  -        return itemLabel;
       }
   
       private void setup() {
  
  
  
  1.10      +13 -2     xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
  
  Index: AddLMVisitor.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AddLMVisitor.java 25 Aug 2003 18:10:30 -0000      1.9
  +++ AddLMVisitor.java 26 Aug 2003 14:35:42 -0000      1.10
  @@ -85,6 +85,7 @@
   import org.apache.fop.fo.flow.Footnote;
   import org.apache.fop.fo.flow.ListBlock;
   import org.apache.fop.fo.flow.ListItemBody;
  +import org.apache.fop.fo.flow.ListItemLabel;
   import org.apache.fop.fo.flow.InstreamForeignObject;
   import org.apache.fop.fo.flow.InlineContainer;
   import org.apache.fop.fo.flow.ListItem;
  @@ -638,12 +639,22 @@
                ListItemLayoutManager blm = new ListItemLayoutManager();
                blm.setUserAgent(node.getUserAgent());
                blm.setFObj(node);
  -             blm.setLabel(node.getLabel().getItemLayoutManager());
  +             blm.setLabel(getListItemLabelLayoutManager(node.getLabel()));
                blm.setBody(getListItemBodyLayoutManager(node.getBody()));
                currentLMList.add(blm);
            } else {
                node.getLogger().error("list-item requires list-item-label and 
list-item-body");
            }
  +     }
  +
  +     /**
  +      * @return this object's Item layout manager
  +      */
  +     public Item getListItemLabelLayoutManager(ListItemLabel node) {
  +         Item itemLabel = new Item();
  +         itemLabel.setUserAgent(node.getUserAgent());
  +         itemLabel.setFObj(node);
  +         return itemLabel;
        }
   
        /**
  
  
  

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

Reply via email to