Skip to content

Commit

Permalink
Fixed incomplete display of conversion exchange rate label
Browse files Browse the repository at this point in the history
  • Loading branch information
buchen committed Jan 13, 2016
1 parent 830d936 commit 435d818
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public void applyChanges()
if (source != null)
{
@SuppressWarnings("unchecked")
TransactionOwner<Transaction> owner = (TransactionOwner<Transaction>) source.getOwner(source
.getPortfolioTransaction());
TransactionOwner<Transaction> owner = (TransactionOwner<Transaction>) source
.getOwner(source.getPortfolioTransaction());
owner.deleteTransaction(source.getPortfolioTransaction(), client);
source = null;
}
Expand Down Expand Up @@ -101,10 +101,15 @@ public void setAccount(Account account)
{
String oldAccountCurrency = getTransactionCurrencyCode();
String oldExchangeRateCurrencies = getExchangeRateCurrencies();
String oldInverseExchangeRateCurrencies = getInverseExchangeRateCurrencies();

firePropertyChange(Properties.account.name(), this.account, this.account = account);

firePropertyChange(Properties.transactionCurrencyCode.name(), oldAccountCurrency, getTransactionCurrencyCode());
firePropertyChange(Properties.exchangeRateCurrencies.name(), oldExchangeRateCurrencies,
getExchangeRateCurrencies());
firePropertyChange(Properties.inverseExchangeRateCurrencies.name(), oldInverseExchangeRateCurrencies,
getInverseExchangeRateCurrencies());

if (getSecurity() != null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,14 @@ public void setTransactionCurrency(CurrencyUnit currency)
{
String oldCurrencyCode = getTransactionCurrencyCode();
String oldExchangeRateCurrencies = getExchangeRateCurrencies();
String oldInverseExchangeRateCurrencies = getInverseExchangeRateCurrencies();

firePropertyChange(Properties.transactionCurrency.name(), transactionCurrency, transactionCurrency = currency);

firePropertyChange(Properties.transactionCurrencyCode.name(), oldCurrencyCode, getTransactionCurrencyCode());
firePropertyChange(Properties.exchangeRateCurrencies.name(), oldExchangeRateCurrencies,
getExchangeRateCurrencies());
firePropertyChange(Properties.inverseExchangeRateCurrencies.name(), oldInverseExchangeRateCurrencies,
getInverseExchangeRateCurrencies());
}
}

0 comments on commit 435d818

Please sign in to comment.