pbwest      2002/11/11 17:31:29

  Modified:    src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
                        BorderWidth.java
  Log:
  FONode arg added, FOTree arg removed from MappedNumeric constructor.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +11 -15    xml-fop/src/org/apache/fop/fo/properties/Attic/BorderWidth.java
  
  Index: BorderWidth.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderWidth.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- BorderWidth.java  31 Oct 2002 01:52:08 -0000      1.1.2.3
  +++ BorderWidth.java  12 Nov 2002 01:31:29 -0000      1.1.2.4
  @@ -83,9 +83,9 @@
                   // check for mapped enum.
                   Numeric mapped;
                   try {
  -                    mapped =
  -                        (new MappedNumeric(PropNames.BORDER_TOP_WIDTH,
  -                            ((NCName)value).getNCName(), foNode.getFOTree()))
  +                    mapped = (new MappedNumeric
  +                                    (foNode, PropNames.BORDER_TOP_WIDTH,
  +                                                ((NCName)value).getNCName()))
                                   .getMappedNumValue();
                   } catch (PropertyException e) {
                       throw new PropertyException
  @@ -118,14 +118,12 @@
   
               // There must be at least two
               top = (new MappedNumeric
  -                        (PropNames.BORDER_TOP_WIDTH,
  -                        ((NCName)(widths.next())).getNCName(),
  -                        foNode.getFOTree())
  +                        (foNode, PropNames.BORDER_TOP_WIDTH,
  +                        ((NCName)(widths.next())).getNCName())
                       ).getMappedNumValue();
               right = (new MappedNumeric
  -                        (PropNames.BORDER_RIGHT_WIDTH,
  -                        ((NCName)(widths.next())).getNCName(),
  -                        foNode.getFOTree())
  +                        (foNode, PropNames.BORDER_RIGHT_WIDTH,
  +                        ((NCName)(widths.next())).getNCName())
                       ).getMappedNumValue();
               try {
                   bottom = (Numeric)(top.clone());
  @@ -139,15 +137,13 @@
   
               if (widths.hasNext())
                   bottom = (new MappedNumeric
  -                            (PropNames.BORDER_BOTTOM_WIDTH,
  -                            ((NCName)(widths.next())).getNCName(),
  -                            foNode.getFOTree())
  +                            (foNode, PropNames.BORDER_BOTTOM_WIDTH,
  +                            ((NCName)(widths.next())).getNCName())
                           ).getMappedNumValue();
               if (widths.hasNext())
                   left = (new MappedNumeric
  -                            (PropNames.BORDER_LEFT_WIDTH,
  -                            ((NCName)(widths.next())).getNCName(),
  -                            foNode.getFOTree())
  +                            (foNode, PropNames.BORDER_LEFT_WIDTH,
  +                            ((NCName)(widths.next())).getNCName())
                           ).getMappedNumValue();
   
               list = new PropertyValueList(PropNames.BORDER_WIDTH);
  
  
  

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

Reply via email to