diff options
| -rw-r--r-- | libjava/ChangeLog | 11 | ||||
| -rw-r--r-- | libjava/java/text/DecimalFormat.java | 24 | ||||
| -rw-r--r-- | libjava/java/text/DecimalFormatSymbols.java | 23 |
3 files changed, 58 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ef79f94..98cc75e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,14 @@ +2003-11-19 Guilhem Lavaux <guilhem@kaffe.org> + Jim Pick <jim@kaffe.org> + + * java/text/DecimalFormat.java (getCurrency, setCurrency): New + methods. + +2003-11-19 Guilhem Lavaux <guilhem@kaffe.org> + + * java/text/DecimalFormatSymbols.java (getCurrency, + setCurrency): New methods. + 2003-11-19 Sascha Brawer <brawer@dandelis.ch> * java/awt/geom/FlatteningPathIterator.java: Entirely re-written. diff --git a/libjava/java/text/DecimalFormat.java b/libjava/java/text/DecimalFormat.java index 8dae187..359ad55 100644 --- a/libjava/java/text/DecimalFormat.java +++ b/libjava/java/text/DecimalFormat.java @@ -37,6 +37,7 @@ exception statement from your version. */ package java.text; +import java.util.Currency; import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; @@ -637,6 +638,19 @@ public class DecimalFormat extends NumberFormat return dest; } + /** + * Returns the currency corresponding to the currency symbol stored + * in the instance of <code>DecimalFormatSymbols</code> used by this + * <code>DecimalFormat</code>. + * + * @return A new instance of <code>Currency</code> if + * the currency code matches a known one, null otherwise. + */ + public Currency getCurrency() + { + return symbols.getCurrency(); + } + public DecimalFormatSymbols getDecimalFormatSymbols () { return symbols; @@ -856,6 +870,16 @@ public class DecimalFormat extends NumberFormat return result; } + /** + * Sets the <code>Currency</code> on the + * <code>DecimalFormatSymbols</code> used, which also sets the + * currency symbols on those symbols. + */ + public void setCurrency(Currency currency) + { + symbols.setCurrency(currency); + } + public void setDecimalFormatSymbols (DecimalFormatSymbols newSymbols) { symbols = newSymbols; diff --git a/libjava/java/text/DecimalFormatSymbols.java b/libjava/java/text/DecimalFormatSymbols.java index 2c1d971..1cb8f4f 100644 --- a/libjava/java/text/DecimalFormatSymbols.java +++ b/libjava/java/text/DecimalFormatSymbols.java @@ -39,6 +39,7 @@ exception statement from your version. */ package java.text; import java.io.Serializable; +import java.util.Currency; import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; @@ -195,6 +196,18 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable } /** + * Returns the currency corresponding to the currency symbol stored + * in the instance of <code>DecimalFormatSymbols</code>. + * + * @return A new instance of <code>Currency</code> if + * the currency code matches a known one. + */ + public Currency getCurrency () + { + return Currency.getInstance (currencySymbol); + } + + /** * This method returns the currency symbol in local format. For example, * "$" for Canadian dollars. * @@ -354,6 +367,16 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable } /** + * This method sets the currency to the specified value. + * + * @param currency The new currency + */ + public void setCurrency (Currency currency) + { + setCurrencySymbol (currency.getSymbol()); + } + + /** * This method sets the currency symbol to the specified value. * * @param currencySymbol The new currency symbol |