pbwest      2002/11/26 18:54:12

  Modified:    src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
                        Property.java
  Log:
  Added Numeric hadling to processEdgeList().
  Changed MessageHandler.log to MessageHandler.logln.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +14 -7     xml-fop/src/org/apache/fop/fo/properties/Attic/Property.java
  
  Index: Property.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Property.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- Property.java     21 Nov 2002 08:22:16 -0000      1.1.2.6
  +++ Property.java     27 Nov 2002 02:54:12 -0000      1.1.2.7
  @@ -684,6 +684,7 @@
        *  or, in any order;
        * border-width
        *     a parsed NCName value containing a standard border width
  +     *     or a Numeric length value (including a percentage)
        * border-style
        *     a parsed NCName value containing a standard border style
        * border-color
  @@ -771,11 +772,17 @@
               int type = pval.getType();
               switch (type) {
               case PropertyValue.COLOR_TYPE:
  -                if (color != null) MessageHandler.log(propName +
  +                if (color != null) MessageHandler.logln(propName +
                               ": duplicate color overrides previous color");
                   color = pval;
                   color.setProperty(colorProp);
                   continue scanning_elements;
  +            case PropertyValue.NUMERIC:
  +                if (width != null) MessageHandler.logln(propName +
  +                            ": duplicate width overrides previous width");
  +                width = pval;
  +                width.setProperty(widthProp);
  +                continue scanning_elements;
               case PropertyValue.NCNAME:
                   // Could be standard color, style Enum or width MappedNumeric
                   PropertyValue colorFound = null;
  @@ -787,7 +794,7 @@
                       styleFound = new EnumType(styleProp, ncname);
                   } catch (PropertyException e) {}
                   if (styleFound != null) {
  -                    if (style != null) MessageHandler.log(propName +
  +                    if (style != null) MessageHandler.logln(propName +
                               ": duplicate style overrides previous style");
                       style = styleFound;
                       continue scanning_elements;
  @@ -799,7 +806,7 @@
                               (foNode, widthProp, ncname)).getMappedNumValue();
                   } catch (PropertyException e) {}
                   if (widthFound != null) {
  -                    if (width != null) MessageHandler.log(propName +
  +                    if (width != null) MessageHandler.logln(propName +
                               ": duplicate width overrides previous width");
                       width = widthFound;
                       continue scanning_elements;
  @@ -809,7 +816,7 @@
                       colorFound = new ColorType(colorProp, ncname);
                   } catch (PropertyException e) {};
                   if (colorFound != null) {
  -                    if (color != null) MessageHandler.log(propName +
  +                    if (color != null) MessageHandler.logln(propName +
                               ": duplicate color overrides previous color");
                       color = colorFound;
                       continue scanning_elements;
  
  
  

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

Reply via email to