You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mm...@locus.apache.org on 2000/08/01 22:16:04 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/templates DecimalFormatProperties.java FuncFormatNumb.java
mmidy 00/08/01 13:16:03
Modified: java/src/org/apache/xalan/templates
DecimalFormatProperties.java FuncFormatNumb.java
Log:
Allow for default decimal-format declaration
Revision Changes Path
1.3 +4 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DecimalFormatProperties.java 2000/07/05 14:39:52 1.2
+++ DecimalFormatProperties.java 2000/08/01 20:16:02 1.3
@@ -137,7 +137,10 @@
*/
public QName getName()
{
- return m_qname;
+ if (m_qname== null)
+ return new QName("");
+ else
+ return m_qname;
}
/**
1.4 +10 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FuncFormatNumb.java 2000/07/28 16:05:41 1.3
+++ FuncFormatNumb.java 2000/08/01 20:16:02 1.4
@@ -133,7 +133,16 @@
//else
if (null == formatter)
{
- if (null != patternStr)
+ // look for a possible default decimal-format
+ if (ss.getDecimalFormatCount() >0)
+ dfs = ss.getDecimalFormatComposed(new QName(""));
+ if (dfs != null)
+ {
+ formatter = new java.text.DecimalFormat();
+ formatter.setDecimalFormatSymbols(dfs);
+ formatter.applyLocalizedPattern(patternStr);
+ }
+ else if (null != patternStr)
{
formatter = new java.text.DecimalFormat(patternStr);
formatter.applyLocalizedPattern(patternStr); // fix bug??