pbwest      2003/03/30 18:32:17

  Modified:    src/org/apache/fop/datatypes/indirect Tag:
                        FOP_0-20-0_Alt-Design FromNearestSpecified.java
                        FromParent.java IndirectValue.java Inherit.java
                        InheritedValue.java
  Log:
  Tidied copyright notice
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.6   +53 -53    
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromNearestSpecified.java
  
  Index: FromNearestSpecified.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromNearestSpecified.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- FromNearestSpecified.java 19 Mar 2003 14:00:00 -0000      1.1.2.5
  +++ FromNearestSpecified.java 31 Mar 2003 02:32:17 -0000      1.1.2.6
  @@ -1,3 +1,54 @@
  +/*
  + * $Id$
  + * 
  + * ============================================================================
  + *                   The Apache Software License, Version 1.1
  + * ============================================================================
  + * 
  + * Copyright (C) 1999-2003 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/>.
  + *  
  + */
   package org.apache.fop.datatypes.indirect;
   
   import org.apache.fop.datatypes.indirect.IndirectValue;
  @@ -6,57 +57,6 @@
   import org.apache.fop.fo.properties.Property;
   import org.apache.fop.fo.FONode;
   
  -/*
  - * $Id$
  - * 
  - *  ============================================================================
  - *                    The Apache Software License, Version 1.1
  - *  ============================================================================
  - *  
  - *  Copyright (C) 1999-2003 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/>.
  - *  
  - */
   /**
    * A pseudo-class to represent a call to the core function
    * from-nearest-specified-value().
  
  
  
  1.1.2.5   +53 -53    
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromParent.java
  
  Index: FromParent.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromParent.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- FromParent.java   19 Mar 2003 14:00:01 -0000      1.1.2.4
  +++ FromParent.java   31 Mar 2003 02:32:17 -0000      1.1.2.5
  @@ -1,3 +1,54 @@
  +/*
  + * $Id$
  + * 
  + * ============================================================================
  + *                   The Apache Software License, Version 1.1
  + * ============================================================================
  + * 
  + * Copyright (C) 1999-2003 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/>.
  + *  
  + */
   package org.apache.fop.datatypes.indirect;
   
   import org.apache.fop.datatypes.indirect.IndirectValue;
  @@ -5,57 +56,6 @@
   import org.apache.fop.fo.expr.PropertyException;
   import org.apache.fop.fo.properties.Property;
   
  -/*
  - * $Id$
  - * 
  - *  ============================================================================
  - *                    The Apache Software License, Version 1.1
  - *  ============================================================================
  - *  
  - *  Copyright (C) 1999-2003 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/>.
  - *  
  - */
   /**
    * A pseudo-class to represent a call to the core function from-parent().
    * Used <i>only</i> in the cases where the property assigned to
  
  
  
  1.1.2.7   +55 -55    
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java
  
  Index: IndirectValue.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- IndirectValue.java        19 Mar 2003 14:00:01 -0000      1.1.2.6
  +++ IndirectValue.java        31 Mar 2003 02:32:17 -0000      1.1.2.7
  @@ -1,3 +1,57 @@
  +/*
  + * $Id$
  + *
  + * 
  + * ============================================================================
  + *                   The Apache Software License, Version 1.1
  + * ============================================================================
  + * 
  + * Copyright (C) 1999-2003 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/>.
  + *  
  + * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
  + * @version $Revision$ $Name$
  + */
   package org.apache.fop.datatypes.indirect;
   
   import org.apache.fop.fo.expr.PropertyException;
  @@ -8,60 +62,6 @@
   import org.apache.fop.fo.PropNames;
   import org.apache.fop.fo.FONode;
   
  -/*
  - * $Id$
  - *
  - * 
  - *  ============================================================================
  - *                    The Apache Software License, Version 1.1
  - *  ============================================================================
  - *  
  - *  Copyright (C) 1999-2003 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/>.
  - *  
  - * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
  - * @version $Revision$ $Name$
  - */
   /**
    * A superclass for objects which may have deferred <tt>PropertyValue</tt>
    * resolution.  This is because their value is taken from
  
  
  
  1.1.2.6   +57 -57    xml-fop/src/org/apache/fop/datatypes/indirect/Attic/Inherit.java
  
  Index: Inherit.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/Inherit.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- Inherit.java      19 Mar 2003 14:00:01 -0000      1.1.2.5
  +++ Inherit.java      31 Mar 2003 02:32:17 -0000      1.1.2.6
  @@ -1,67 +1,67 @@
  -package org.apache.fop.datatypes.indirect;
  -
  -import org.apache.fop.fo.expr.PropertyException;
  -import org.apache.fop.datatypes.PropertyValue;
  -import org.apache.fop.fo.properties.Property;
  -import org.apache.fop.fo.FONode;
  -import org.apache.fop.datatypes.indirect.IndirectValue;
  -
   /*
    * Inherit.java
    * $Id$
    *
    * Created: Tue Nov 20 22:18:11 2001
    * 
  - *  ============================================================================
  - *                    The Apache Software License, Version 1.1
  - *  ============================================================================
  - *  
  - *  Copyright (C) 1999-2003 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/>.
  + * ============================================================================
  + *                   The Apache Software License, Version 1.1
  + * ============================================================================
  + * 
  + * Copyright (C) 1999-2003 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/>.
    *  
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Revision$ $Name$
    */
  +package org.apache.fop.datatypes.indirect;
  +
  +import org.apache.fop.fo.expr.PropertyException;
  +import org.apache.fop.datatypes.PropertyValue;
  +import org.apache.fop.fo.properties.Property;
  +import org.apache.fop.fo.FONode;
  +import org.apache.fop.datatypes.indirect.IndirectValue;
  +
   /**
    * A class representing the <tt>inherit</tt> keyword.  This keyword is
    * regarded as a property value which is always equivalent to the computed
  
  
  
  1.1.2.7   +55 -55    
xml-fop/src/org/apache/fop/datatypes/indirect/Attic/InheritedValue.java
  
  Index: InheritedValue.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/InheritedValue.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- InheritedValue.java       19 Mar 2003 14:00:01 -0000      1.1.2.6
  +++ InheritedValue.java       31 Mar 2003 02:32:17 -0000      1.1.2.7
  @@ -1,3 +1,57 @@
  +/*
  + * $Id$
  + *
  + * 
  + * ============================================================================
  + *                   The Apache Software License, Version 1.1
  + * ============================================================================
  + * 
  + * Copyright (C) 1999-2003 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/>.
  + *  
  + * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
  + * @version $Revision$ $Name$
  + */
   package org.apache.fop.datatypes.indirect;
   
   import org.apache.fop.fo.expr.PropertyException;
  @@ -7,60 +61,6 @@
   import org.apache.fop.fo.PropertyConsts;
   import org.apache.fop.datatypes.indirect.IndirectValue;
   
  -/*
  - * $Id$
  - *
  - * 
  - *  ============================================================================
  - *                    The Apache Software License, Version 1.1
  - *  ============================================================================
  - *  
  - *  Copyright (C) 1999-2003 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/>.
  - *  
  - * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
  - * @version $Revision$ $Name$
  - */
   /**
    * A class representing an unresolved inherited value.  It may be created as
    * in the process of resolving "normal" default inheritance, when no value is
  
  
  

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

Reply via email to