pbwest      2002/10/21 09:07:32

  Modified:    src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
                        PropertyParser.java
  Log:
  Use PropertyConsts.pconsts singleton.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.16  +8 -10     xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java
  
  Index: PropertyParser.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java,v
  retrieving revision 1.5.2.15
  retrieving revision 1.5.2.16
  diff -u -r1.5.2.15 -r1.5.2.16
  --- PropertyParser.java       19 Oct 2002 03:42:19 -0000      1.5.2.15
  +++ PropertyParser.java       21 Oct 2002 16:07:31 -0000      1.5.2.16
  @@ -59,8 +59,6 @@
       private FOTree foTree;
       /** The FONode which has initiated this parser */
       private FONode node;
  -    public final PropertyConsts propertyConsts =
  -                                        PropertyConsts.getPropertyConsts();
   
       public PropertyParser(FOTree foTree) {
           super();
  @@ -698,12 +696,12 @@
                                   ((StringType)args[0]).getString());
   
                       // If it's a compound, return an InheritedValue object
  -                    if (propertyConsts.isCompound(propindex)) {
  +                    if (PropertyConsts.pconsts.isCompound(propindex)) {
                           prop = new InheritedValue(property, propindex);
                           break;
                       }
                       // Is it an inherited property?
  -                    if (propertyConsts.inheritance(propindex)
  +                    if (PropertyConsts.pconsts.inheritance(propindex)
                                                               == Property.NO)
                           throw new PropertyException
                                   ("inherited-property-value: "
  @@ -732,8 +730,8 @@
   
                       PropertyValue[] args = parseArgs(0, 1);
                       if (args.length == 0) {
  -                        if (! (propertyConsts.isShorthand(property)
  -                               || propertyConsts.isCompound(property))) {
  +                        if (! (PropertyConsts.pconsts.isShorthand(property)
  +                           || PropertyConsts.pconsts.isCompound(property))) {
                               // develop the function value and return it as
                               // a property.
                               switch (funcType) {
  @@ -756,8 +754,8 @@
                           String propname = ncname.getNCName();
                           int nameindex =
                                   PropNames.getPropertyIndex(propname);
  -                        if (propertyConsts.isShorthand(nameindex)
  -                            || propertyConsts.isCompound(nameindex)) {
  +                        if (PropertyConsts.pconsts.isShorthand(nameindex)
  +                            || PropertyConsts.pconsts.isCompound(nameindex)) {
                               // the argument is a shorthand/compound property -
                               // it must be the same as the property being
                               // assigned to.
  
  
  

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

Reply via email to