cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/table Row.java

[gmazza]

gmazza  2004/03/17 16:22:40

  Modified:src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
AddLMVisitor.java ContentLayoutManager.java
LayoutManagerLS.java LayoutProcessor.java
LineLayoutManager.java PageLayoutManager.java
RetrieveMarkerLayoutManager.java
   src/java/org/apache/fop/layoutmgr/table Row.java
  Log:
  Switch from init() to clearer initialize() in Layout classes; removed
  unneeded logger reference in ContentLayoutManager.
  
  Revision  ChangesPath
  1.8   +4 -4  
xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
  
  Index: AbstractLayoutManager.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractLayoutManager.java12 Mar 2004 00:41:04 -  1.7
  +++ AbstractLayoutManager.java18 Mar 2004 00:22:40 -  1.8
  @@ -165,7 +165,7 @@
   curChildLM = (LayoutProcessor) childLMiter.next();
   curChildLM.setUserAgent(getUserAgent());
   curChildLM.setParent(this);
  -curChildLM.init();
  +curChildLM.initialize();
   return curChildLM;
   }
   return null;
  @@ -222,10 +222,10 @@
   
   
   /**
  - * This method provides a hook for a LayoutManager to intialize traits
  + * This method provides a hook for a LayoutManager to initialize traits
* for the areas it will create, based on Properties set on its FO.
*/
  -public void init() {
  +public void initialize() {
   if (fobj != null  bInited == false) {
   initProperties(fobj.getPropertyManager());
   bInited = true;
  @@ -233,7 +233,7 @@
   }
   
   /**
  - * This method provides a hook for a LayoutManager to intialize traits
  + * This method provides a hook for a LayoutManager to initialize traits
* for the areas it will create, based on Properties set on its FO.
*/
   protected void initProperties(PropertyManager pm) {
  
  
  
  1.34  +2 -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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- AddLMVisitor.java 17 Mar 2004 03:54:53 -  1.33
  +++ AddLMVisitor.java 18 Mar 2004 00:22:40 -  1.34
  @@ -369,7 +369,7 @@
lm.setUserAgent(node.getUserAgent());
lm.setFObj(node);
lm.setLMiter(new LMiter(lm, node.getChildren()));
  - lm.init();
  + lm.initialize();
   
// get breaks then add areas to FilledArea
FilledArea fa = new FilledArea();
  
  
  
  1.7   +1 -11 
xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
  
  Index: ContentLayoutManager.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ContentLayoutManager.java 27 Feb 2004 17:49:25 -  1.6
  +++ ContentLayoutManager.java 18 Mar 2004 00:22:40 -  1.7
  @@ -25,8 +25,6 @@
   import org.apache.fop.area.Resolveable;
   import org.apache.fop.area.PageViewport;
   
  -import org.apache.avalon.framework.logger.Logger;
  -
   import java.util.List;
   import java.util.Map;
   import java.util.ArrayList;
  @@ -163,14 +161,6 @@
   return userAgent;
   }
   
  -/**
  - * Returns the logger
  - * @return the logger
  - */
  -protected Logger getLogger() {
  -return userAgent.getLogger();
  -}
  -
   /** @see org.apache.fop.layoutmgr.LayoutManager */
   public void setParent(LayoutProcessor lm) {
   parentLM = lm;
  @@ -208,7 +198,7 @@
   public void addAreas(PositionIterator posIter, LayoutContext context) { }
   
   /** @see org.apache.fop.layoutmgr.LayoutManager */
  -public void init() {
  +public void initialize() {
   //to be done
   }
   
  
  
  
  1.21  +4 -4  xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
  
  Index: LayoutManagerLS.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- LayoutManagerLS.java  27 Feb 2004 17:49:25 -  1.20
  +++ LayoutManagerLS.java  18 Mar 2004 00:22:40 - 

cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/table Row.java

[pietsch]

pietsch 2004/02/07 15:10:19

  Modified:src/java/org/apache/fop/layoutmgr/table Row.java
  Log:
  Fixed the missing table header bug.
  
  Revision  ChangesPath
  1.6   +2 -2  xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java
  
  Index: Row.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Row.java  8 Sep 2003 17:00:56 -   1.5
  +++ Row.java  7 Feb 2004 23:10:19 -   1.6
  @@ -273,7 +273,7 @@
   int cellcount = 0;
   
   if (pos == null) {
  -while ((curLM = getCellLM(cellcount++)) != null) {
  +while ((curLM = getCellLM(cellcount)) != null) {
   curLM.resetPosition(null);
   cellcount++;
   }
  @@ -281,7 +281,7 @@
   RowPosition rpos = (RowPosition)pos;
   List breaks = rpos.cellBreaks;
   
  -while ((curLM = getCellLM(cellcount++)) != null) {
  +while ((curLM = getCellLM(cellcount)) != null) {
   List childbreaks = (List)breaks.get(cellcount);
   curLM.resetPosition((Position)childbreaks.get(childbreaks.size() - 
1));
   cellcount++;
  
  
  

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