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

[vmote]

vmote       2003/08/28 11:03:13

  Modified:    src/java/org/apache/fop/fo/pagination StaticContent.java
               src/java/org/apache/fop/layoutmgr PageLayoutManager.java
  Log:
  move fo/pagination/StaticContent.getLayoutManager() to 
layoutmgr/PageLayoutManager.getStaticContentLayoutManager()
  
  Revision  Changes    Path
  1.6       +1 -16     xml-fop/src/java/org/apache/fop/fo/pagination/StaticContent.java
  
  Index: StaticContent.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/StaticContent.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StaticContent.java        27 Aug 2003 18:35:21 -0000      1.5
  +++ StaticContent.java        28 Aug 2003 18:03:12 -0000      1.6
  @@ -54,7 +54,6 @@
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.FOTreeVisitor;
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.layoutmgr.StaticContentLayoutManager;
   
   /**
    * Class modelling the fo:static-content object. See Sec. 6.4.19 of the XSL-FO
  @@ -85,20 +84,6 @@
               super.setFlowName(name);
           }
   
  -    }
  -
  -    private StaticContentLayoutManager lm;
  -
  -    /**
  -     * @return this object's layout manager
  -     */
  -    public StaticContentLayoutManager getLayoutManager() {
  -        if (lm == null) {
  -            lm = new StaticContentLayoutManager();
  -            lm.setUserAgent(getUserAgent());
  -            lm.setFObj(this);
  -        }
  -        return lm;
       }
   
       /**
  
  
  
  1.16      +11 -1     xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
  
  Index: PageLayoutManager.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- PageLayoutManager.java    27 Aug 2003 18:35:21 -0000      1.15
  +++ PageLayoutManager.java    28 Aug 2003 18:03:13 -0000      1.16
  @@ -479,7 +479,7 @@
           if (reg == null) {
               getLogger().error("no region viewport: shouldn't happen");
           }
  -        StaticContentLayoutManager lm = flow.getLayoutManager();
  +        StaticContentLayoutManager lm = getStaticContentLayoutManager(flow);
           lm.setUserAgent(getUserAgent());
           lm.init();
           lm.setRegionReference(reg.getRegion());
  @@ -889,6 +889,16 @@
           FODimension reldims = new FODimension(0, 0);
           rr.setCTM(CTM.getCTMandRelDims(r.getPropertyManager().getAbsRefOrient(),
                   r.getPropertyManager().getWritingMode(), absRegVPRect, reldims));
  +    }
  +
  +    /**
  +     * @return a StaticContent layout manager
  +     */
  +    public StaticContentLayoutManager getStaticContentLayoutManager(StaticContent 
sc) {
  +        StaticContentLayoutManager lm = new StaticContentLayoutManager();
  +        lm.setUserAgent(getUserAgent());
  +        lm.setFObj(sc);
  +        return lm;
       }
   
   }
  
  
  

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