pbwest      2002/10/10 10:07:00

  Modified:    src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
                        FoLayoutMasterSet.java
  Log:
  Immediate initialisation of pageMasters and simplePageMasters.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +5 -7      
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
  
  Index: FoLayoutMasterSet.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- FoLayoutMasterSet.java    9 Oct 2002 06:00:49 -0000       1.1.2.6
  +++ FoLayoutMasterSet.java    10 Oct 2002 17:06:59 -0000      1.1.2.7
  @@ -53,13 +53,13 @@
        * Hash of SimplePageMaster and PageSequenceMaster objects,
        * indexed by master-name of the object.
        */
  -    private HashMap pageMasters;
  +    private HashMap pageMasters = new HashMap();
   
       /**
        * Hash of SimplePageMaster objects,
        * indexed by master-name of the object.
        */
  -    private HashMap simplePageMasters;
  +    private HashMap simplePageMasters = new HashMap();
   
       /**
        * @param foTree the FO tree being built
  @@ -96,8 +96,6 @@
                       System.out.println("Found simple-page-master");
                       simple = new FoSimplePageMaster(foTree, this, ev);
                       simpleName = simple.getMasterName();
  -                    if (pageMasters == null)
  -                        pageMasters = new HashMap();
                       if (pageMasters.get
                           ((Object)(simpleName)) != null)
                           throw new FOPException
  
  
  

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

Reply via email to