cvs commit: xml-xalan/java/src/org/apache/xalan/templates DecimalFormatProperties.java FuncFormatNumb.java

[mmidy]

mmidy       00/08/28 11:43:15

  Modified:    java/src/org/apache/xalan/templates
                        DecimalFormatProperties.java FuncFormatNumb.java
  Log:
  Set default values for Infinity and NaN for formatNumber
  
  Revision  Changes    Path
  1.4       +9 -1      
xml-xalan/java/src/org/apache/xalan/templates/DecimalFormatProperties.java
  
  Index: DecimalFormatProperties.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/DecimalFormatProperties.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DecimalFormatProperties.java      2000/08/01 20:16:02     1.3
  +++ DecimalFormatProperties.java      2000/08/28 18:43:09     1.4
  @@ -90,7 +90,15 @@
    */
   public class DecimalFormatProperties
   {  
  -  DecimalFormatSymbols m_dfs = new java.text.DecimalFormatSymbols();
  +  DecimalFormatSymbols m_dfs; 
  +  
  +  public DecimalFormatProperties()
  +  {
  +    m_dfs = new java.text.DecimalFormatSymbols();
  +    // Set default values, they can be overiden if necessary.  
  +    m_dfs.setInfinity(Constants.ATTRVAL_INFINITY);
  +    m_dfs.setNaN(Constants.ATTRVAL_NAN);
  +  }  
     
     /**
      * Return the decimal format Symbols for this element.
  
  
  
  1.5       +9 -5      
xml-xalan/java/src/org/apache/xalan/templates/FuncFormatNumb.java
  
  Index: FuncFormatNumb.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/FuncFormatNumb.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FuncFormatNumb.java       2000/08/01 20:16:02     1.4
  +++ FuncFormatNumb.java       2000/08/28 18:43:09     1.5
  @@ -142,13 +142,17 @@
             formatter.setDecimalFormatSymbols(dfs);
             formatter.applyLocalizedPattern(patternStr);
           }  
  -        else if (null != patternStr)
  +        else 
           {
  -          formatter = new java.text.DecimalFormat(patternStr);
  -          formatter.applyLocalizedPattern(patternStr); // fix bug??
  -        }
  -        else
  +          dfs = new java.text.DecimalFormatSymbols();
  +          dfs.setInfinity(Constants.ATTRVAL_INFINITY);
  +          dfs.setNaN(Constants.ATTRVAL_NAN);
             formatter = new java.text.DecimalFormat();
  +          formatter.setDecimalFormatSymbols(dfs);
  +          
  +          if (null != patternStr)
  +            formatter.applyLocalizedPattern(patternStr);
  +        }        
         }
         return new XString(formatter.format(num));
       }