make displayLabel a field on currency data rather than a getter so json deserialization works correctly.

This commit is contained in:
Keith Woodlock
2012-07-23 19:13:59 +01:00
parent 9e2d9340f7
commit 8e7a546780
@@ -4,15 +4,12 @@ import java.io.Serializable;
public class CurrencyData implements Serializable { public class CurrencyData implements Serializable {
private String code; private final String code;
private String name; private final String name;
private int decimalPlaces; private final int decimalPlaces;
private String displaySymbol; private final String displaySymbol;
private String nameCode; private final String nameCode;
private final String displayLabel;
public CurrencyData() {
//
}
public CurrencyData(final String code, final String name, final int decimalPlaces, String displaySymbol, String nameCode) { public CurrencyData(final String code, final String name, final int decimalPlaces, String displaySymbol, String nameCode) {
this.code = code; this.code = code;
@@ -20,6 +17,7 @@ public class CurrencyData implements Serializable {
this.decimalPlaces = decimalPlaces; this.decimalPlaces = decimalPlaces;
this.displaySymbol = displaySymbol; this.displaySymbol = displaySymbol;
this.nameCode = nameCode; this.nameCode = nameCode;
this.displayLabel = generateDisplayLabel();
} }
@Override @Override
@@ -33,7 +31,7 @@ public class CurrencyData implements Serializable {
return this.code.hashCode(); return this.code.hashCode();
} }
public String getDisplayLabel() { private String generateDisplayLabel() {
StringBuilder builder = new StringBuilder(this.name).append(' '); StringBuilder builder = new StringBuilder(this.name).append(' ');
@@ -46,43 +44,27 @@ public class CurrencyData implements Serializable {
return builder.toString(); return builder.toString();
} }
public String getName() { public String getCode() {
return this.name; return code;
} }
public String getCode() { public String getName() {
return this.code; return name;
} }
public int getDecimalPlaces() { public int getDecimalPlaces() {
return this.decimalPlaces; return decimalPlaces;
}
public void setCode(final String code) {
this.code = code;
}
public void setName(final String name) {
this.name = name;
}
public void setDecimalPlaces(final int decimalPlaces) {
this.decimalPlaces = decimalPlaces;
} }
public String getDisplaySymbol() { public String getDisplaySymbol() {
return displaySymbol; return displaySymbol;
} }
public void setDisplaySymbol(String displaySymbol) {
this.displaySymbol = displaySymbol;
}
public String getNameCode() { public String getNameCode() {
return nameCode; return nameCode;
} }
public void setNameCode(String nameCode) { public String getDisplayLabel() {
this.nameCode = nameCode; return displayLabel;
} }
} }