pbwest      2004/01/26 18:06:53

  Modified:    src/java/org/apache/fop/fo/pagination Tag:
                        FOP_0-20-0_Alt-Design FoPageSequenceMaster.java
  Log:
  Updated license to 2.0.
  Other tidying up.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.7   +18 -58    
xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
  
  Index: FoPageSequenceMaster.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- FoPageSequenceMaster.java 20 Jan 2004 05:45:54 -0000      1.1.2.6
  +++ FoPageSequenceMaster.java 27 Jan 2004 02:06:53 -0000      1.1.2.7
  @@ -1,55 +1,20 @@
   /*
  - * $Id$
  - * 
  - * ============================================================================
  - *                   The Apache Software License, Version 1.1
  - * ============================================================================
  - * 
  - * Copyright (C) 1999-2004 The Apache Software Foundation. All rights reserved.
  - * 
  - * Redistribution and use in source and binary forms, with or without modifica-
  - * tion, are permitted provided that the following conditions are met:
  - * 
  - * 1. Redistributions of  source code must  retain the above copyright  notice,
  - *    this list of conditions and the following disclaimer.
  - * 
  - * 2. Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - * 
  - * 3. The end-user documentation included with the redistribution, if any, must
  - *    include  the following  acknowledgment:  "This product includes  software
  - *    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  - *    Alternately, this  acknowledgment may  appear in the software itself,  if
  - *    and wherever such third-party acknowledgments normally appear.
  - * 
  - * 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
  - *    endorse  or promote  products derived  from this  software without  prior
  - *    written permission. For written permission, please contact
  - *    [EMAIL PROTECTED]
  - * 
  - * 5. Products  derived from this software may not  be called "Apache", nor may
  - *    "Apache" appear  in their name,  without prior written permission  of the
  - *    Apache Software Foundation.
  - * 
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - * FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  - * APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  - * INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  - * DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - * OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  - * ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  - * (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - * 
  - * This software  consists of voluntary contributions made  by many individuals
  - * on  behalf of the Apache Software  Foundation and was  originally created by
  - * James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache 
  - * Software Foundation, please see <http://www.apache.org/>.
  +   Copyright 2004 The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License.
  +
    *  
  - *
  - * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
  + * $Id$
    */
   
   package org.apache.fop.fo.pagination;
  @@ -75,6 +40,8 @@
    * children of fo:layout-master-set FOs.  Their contents are specified by
    * (single-page-master-reference|repeatable-page-master-reference
    *                                |repeatable-page-master-alternatives)+
  + *
  + * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    */
   public class FoPageSequenceMaster extends FONode {
   
  @@ -236,17 +203,12 @@
                   if (ev == null) break;  // page-sequence-masters exhausted
                   int foType = ev.getFoType();
                   if (foType == FObjectNames.SINGLE_PAGE_MASTER_REFERENCE) {
  -                    //System.out.println("Found single-page-master-reference");
                       new FoSinglePageMasterReference(foTree, this, ev);
                   } else if (foType ==
                               FObjectNames.REPEATABLE_PAGE_MASTER_REFERENCE) {
  -                    //System.out.println
  -                    //        ("Found repeatable-page-master-reference");
                       new FoRepeatablePageMasterReference(foTree, this, ev);
                   } else if (foType ==
                           FObjectNames.REPEATABLE_PAGE_MASTER_ALTERNATIVES) {
  -                    //System.out.println
  -                    //        ("Found repeatable-page-master-alternatives");
                       new FoRepeatablePageMasterAlternatives(foTree, this, ev);
                   } else
                       throw new FOPException
  @@ -339,8 +301,6 @@
                               (FObjectNames.CONDITIONAL_PAGE_MASTER_REFERENCE,
                                                       XmlEvent.DISCARD_W_SPACE);
                       if (ev == null) break; // Sub-sequences exhausted
  -                    //System.out.println
  -                    //    ("Found conditional-page-master-reference");
                       new FoConditionalPageMasterReference(foTree, this, ev);
                       ev = this.xmlevents.getEndElement
                                       (XmlEventReader.DISCARD_EV, ev);
  
  
  

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

Reply via email to