Updated license to 2.0.

Return unmodifiable Map finalPageSequenceMasters in place of HashMap pageSequenceMasters.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197270 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java b/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
index e9db16904cd718e09000068237678abd67ae057e..6e6b2c13698755596ec6d3d9b93812172f19c753 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
+++ b/src/java/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
@@ -1,63 +1,28 @@
 /*
+   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.
+
  * $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
- *    apache@apache.org.
- * 
- * 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 <jtauber@jtauber.com>. For more  information on the Apache 
- * Software Foundation, please see <http://www.apache.org/>.
- *  
- * 
- * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
- * @version $Revision$ $Name$
  */
 package org.apache.fop.fo.pagination;
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.NoSuchElementException;
 
 import org.apache.fop.apps.FOPException;
@@ -74,6 +39,9 @@ import org.apache.fop.xml.XmlEvent;
  * <tt>FoLayoutMasterSet</tt> is the class which processes the
  * <i>layout-master-set</i> element.  This is the compulsory first element
  * under the <i>root</i> element in an FO document.
+ * 
+ * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
+ * @version $Revision$ $Name$
  */
 
 public class FoLayoutMasterSet extends FONode {
@@ -134,6 +102,8 @@ public class FoLayoutMasterSet extends FONode {
      * <tt>FoPageSequenceMaster</tt>s.
      */
     private HashMap pageSequenceMasters = new HashMap();
+    
+    public Map finalPageSequenceMasters;
 
     /**
      * @param foTree the FO tree being built
@@ -254,14 +224,21 @@ public class FoLayoutMasterSet extends FONode {
                 ((FoPageSequenceMaster)(values.next()), simplePageMasters);
             pageSequenceMasters.put(pageSeq.getMasterName(), pageSeq);
         }
+        //Create the unmodifiable Map
+        finalPageSequenceMasters =
+            Collections.unmodifiableMap(pageSequenceMasters);
+        // Nullify the now-redundant HashMaps
+        simplePageMasters = null;
+        pageMasters = null;
     }
 
     /**
-     * Make the <tt>HashMap</tt> of <tt>PageSequenceMaster</tt>s available.
-     * @return - the <i>pageSequenceMasters</i> <tt>HashMap</tt>.
+     * Make the unmodifiable <tt>Map</tt> of <tt>PageSequenceMaster</tt>s
+     * available.
+     * @return - the <i>finalPageSequenceMasters</i> <tt>Map</tt>.
      */
-    public HashMap getPageSequenceMasters() {
-        return pageSequenceMasters;
+    public Map getPageSequenceMasters() {
+        return finalPageSequenceMasters;
     }
         
 }// FoLayoutMasterSet