pbwest      2002/09/26 07:34:14

  Modified:    src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
                        PropertySets.java
  Log:
  Commented out initialValueSHandExpansion().
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.16  +13 -4     xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java
  
  Index: PropertySets.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java,v
  retrieving revision 1.1.2.15
  retrieving revision 1.1.2.16
  diff -u -r1.1.2.15 -r1.1.2.16
  --- PropertySets.java 24 Sep 2002 05:29:30 -0000      1.1.2.15
  +++ PropertySets.java 26 Sep 2002 14:34:14 -0000      1.1.2.16
  @@ -728,6 +728,12 @@
        * expansions for the (shorthand) property
        * @exception <tt>PropertyException</tt>
        */
  +     /*
  +      Don't do this.  Shorthands should not expand initial values, because
  +      a distinction is needed between those properties which are given
  +      a specified value and those which are set by normal inheritance or from
  +      their initial values.  This so that fromSpecifiedValue() will work.
  +
       public static PropertyValueList initialValueSHandExpansion
           (FOTree foTree, int property)
           throws PropertyException
  @@ -742,6 +748,7 @@
           }
           return list;
       }
  +    */
   
       /**
        * Given a shorthand expansion list and a <tt>PropertyValue</tt>,
  @@ -1253,7 +1260,9 @@
       /**
        * Append the initial values of each non-copy property in a
        * compound expansion to a list.  Note that these elements will be
  -     * <b>references</b> to the initial values.
  +     * <b>references</b> to the initial values. Note also that, in the
  +     * expansion of a compound value, the initial value comonents are
  +     * regarded as having been specified.
        * @param foTree - the <tt>FOTree</tt> of the node whose properties are
        * being processed.
        * @param expansion - the set of indices of the expansion properties.
  
  
  

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

Reply via email to