diff -r f6073056b9fe -r a7e6f84fb078 task2/solution13/src/org/apidesign/apifest08/currency/ConvertorCurrency.java --- a/task2/solution13/src/org/apidesign/apifest08/currency/ConvertorCurrency.java Wed Oct 01 10:43:05 2008 +0200 +++ b/task2/solution13/src/org/apidesign/apifest08/currency/ConvertorCurrency.java Tue Oct 07 01:18:23 2008 +0200 @@ -40,7 +40,24 @@ } @Override + public boolean equals(Object obj) { + boolean result; + if (obj instanceof ConvertorCurrency) { + ConvertorCurrency that = (ConvertorCurrency) obj; + result = currency.equals(that.currency); + } else { + result = false; + } + return result; + } + + + @Override public String toString() { - return getClass() + " based on " + (currency != null ? currency.toString() : "NO-BASE-CURRENCY"); + return "ConvertorCurrency[" + (currency != null ? currency.toString() : "NO-BASE-CURRENCY")+"]"; + } + + String getCurrencyCode() { + return currency.getCurrencyCode(); } }