Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-02 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename CoinFormat to MonetaryFormat, now that it can deal with Coin and Fiat mostly the same way.

Browse Source
This commit is contained in:
Andreas Schildbach
2014-08-25 15:41:23 +02:00
committed by Mike Hearn
parent 59efe031c4
commit b1176e0fdf
5 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/google/bitcoin/core/Coin.java
View File

@@ -16,7 +16,7 @@
package com.google.bitcoin.core;
import com.google.bitcoin.utils.CoinFormat;
import com.google.bitcoin.utils.MonetaryFormat;
import com.google.common.math.LongMath;
import java.io.Serializable;
@@ -220,7 +220,7 @@ public final class Coin implements Monetary, Comparable<Coin>, Serializable {
return this.value;
}
private static final CoinFormat FRIENDLY_FORMAT = CoinFormat.BTC.minDecimals(2).repeatOptionalDecimals(1, 6).postfixCode();
private static final MonetaryFormat FRIENDLY_FORMAT = MonetaryFormat.BTC.minDecimals(2).repeatOptionalDecimals(1, 6).postfixCode();
/**
* Returns the value as a 0.12 type string. More digits after the decimal place will be used
@@ -230,7 +230,7 @@ public final class Coin implements Monetary, Comparable<Coin>, Serializable {
return FRIENDLY_FORMAT.format(this).toString();
}
private static final CoinFormat PLAIN_FORMAT = CoinFormat.BTC.minDecimals(0).repeatOptionalDecimals(1, 8).noCode();
private static final MonetaryFormat PLAIN_FORMAT = MonetaryFormat.BTC.minDecimals(0).repeatOptionalDecimals(1, 8).noCode();
/**
* <p>

4
core/src/main/java/com/google/bitcoin/utils/Fiat.java
View File

@@ -168,7 +168,7 @@ public final class Fiat implements Monetary, Comparable<Fiat>, Serializable {
return this.value;
}
private static final CoinFormat FRIENDLY_FORMAT = CoinFormat.FIAT.postfixCode();
private static final MonetaryFormat FRIENDLY_FORMAT = MonetaryFormat.FIAT.postfixCode();
/**
* Returns the value as a 0.12 type string. More digits after the decimal place will be used if necessary, but two
@@ -178,7 +178,7 @@ public final class Fiat implements Monetary, Comparable<Fiat>, Serializable {
return FRIENDLY_FORMAT.code(0, currencyCode).format(this).toString();
}
private static final CoinFormat PLAIN_FORMAT = CoinFormat.FIAT.minDecimals(0).repeatOptionalDecimals(1, 4).noCode();
private static final MonetaryFormat PLAIN_FORMAT = MonetaryFormat.FIAT.minDecimals(0).repeatOptionalDecimals(1, 4).noCode();
/**
* <p>

106
core/src/main/java/com/google/bitcoin/utils/CoinFormat.java → core/src/main/java/com/google/bitcoin/utils/MonetaryFormat.java
View File

@@ -39,21 +39,21 @@ import com.google.bitcoin.core.Monetary;
* </p>
*
* <p>
* CoinFormat instances are immutable. Invoking a configuration method has no effect on the receiving instance; you must
* store and use the new instance it returns, instead. Instances are thread safe, so they may be stored safely as static
* constants.
* MonetaryFormat instances are immutable. Invoking a configuration method has no effect on the receiving instance; you
* must store and use the new instance it returns, instead. Instances are thread safe, so they may be stored safely as
* static constants.
* </p>
*/
public final class CoinFormat {
public final class MonetaryFormat {
/** Standard format for the BTC denomination. */
public static final CoinFormat BTC = new CoinFormat().shift(0).minDecimals(2).repeatOptionalDecimals(2, 3);
public static final MonetaryFormat BTC = new MonetaryFormat().shift(0).minDecimals(2).repeatOptionalDecimals(2, 3);
/** Standard format for the mBTC denomination. */
public static final CoinFormat MBTC = new CoinFormat().shift(3).minDecimals(2).optionalDecimals(2);
public static final MonetaryFormat MBTC = new MonetaryFormat().shift(3).minDecimals(2).optionalDecimals(2);
/** Standard format for the µBTC denomination. */
public static final CoinFormat UBTC = new CoinFormat().shift(6).minDecimals(0).optionalDecimals(2);
public static final MonetaryFormat UBTC = new MonetaryFormat().shift(6).minDecimals(0).optionalDecimals(2);
/** Standard format for fiat amounts. */
public static final CoinFormat FIAT = new CoinFormat().shift(0).minDecimals(2).repeatOptionalDecimals(2, 1);
public static final MonetaryFormat FIAT = new MonetaryFormat().shift(0).minDecimals(2).repeatOptionalDecimals(2, 1);
/** Currency code for base 1 Bitcoin. */
public static final String CODE_BTC = "BTC";
/** Currency code for base 1/1000 Bitcoin. */
@@ -78,13 +78,13 @@ public final class CoinFormat {
/**
* Set character to prefix negative values.
*/
public CoinFormat negativeSign(char negativeSign) {
public MonetaryFormat negativeSign(char negativeSign) {
checkArgument(!Character.isDigit(negativeSign));
checkArgument(negativeSign > 0);
if (negativeSign == this.negativeSign)
return this;
else
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
@@ -92,23 +92,23 @@ public final class CoinFormat {
* Set character to prefix positive values. A zero value means no sign is used in this case. For parsing, a missing
* sign will always be interpreted as if the positive sign was used.
*/
public CoinFormat positiveSign(char positiveSign) {
public MonetaryFormat positiveSign(char positiveSign) {
checkArgument(!Character.isDigit(positiveSign));
if (positiveSign == this.positiveSign)
return this;
else
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
/**
* Set character range to use for representing digits. It starts with the specified character representing zero.
*/
public CoinFormat digits(char zeroDigit) {
public MonetaryFormat digits(char zeroDigit) {
if (zeroDigit == this.zeroDigit)
return this;
else
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
@@ -116,13 +116,13 @@ public final class CoinFormat {
* Set character to use as the decimal mark. If the formatted value does not have any decimals, no decimal mark is
* used either.
*/
public CoinFormat decimalMark(char decimalMark) {
public MonetaryFormat decimalMark(char decimalMark) {
checkArgument(!Character.isDigit(decimalMark));
checkArgument(decimalMark > 0);
if (decimalMark == this.decimalMark)
return this;
else
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
@@ -132,11 +132,11 @@ public final class CoinFormat {
* {@link #repeatOptionalDecimals(int, int)}), the value will be rounded. This configuration is not relevant for
* parsing.
*/
public CoinFormat minDecimals(int minDecimals) {
public MonetaryFormat minDecimals(int minDecimals) {
if (minDecimals == this.minDecimals)
return this;
else
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
@@ -155,12 +155,12 @@ public final class CoinFormat {
* @param groups
* any number numbers of decimals, one for each group
*/
public CoinFormat optionalDecimals(int... groups) {
public MonetaryFormat optionalDecimals(int... groups) {
List<Integer> decimalGroups = new ArrayList<Integer>(groups.length);
for (int group : groups)
decimalGroups.add(group);
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups, shift,
roundingMode, codes, codeSeparator, codePrefixed);
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
/**
@@ -180,46 +180,46 @@ public final class CoinFormat {
* @param repetitions
* number of repetitions
*/
public CoinFormat repeatOptionalDecimals(int decimals, int repetitions) {
public MonetaryFormat repeatOptionalDecimals(int decimals, int repetitions) {
checkArgument(repetitions >= 0);
List<Integer> decimalGroups = new ArrayList<Integer>(repetitions);
for (int i = 0; i < repetitions; i++)
decimalGroups.add(decimals);
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups, shift,
roundingMode, codes, codeSeparator, codePrefixed);
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
/**
* Set number of digits to shift the decimal separator to the right, coming from the standard BTC notation that was
* common pre-2014. Note this will change the currency code if enabled.
*/
public CoinFormat shift(int shift) {
public MonetaryFormat shift(int shift) {
if (shift == this.shift)
return this;
else
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
/**
* Set rounding mode to use when it becomes necessary.
*/
public CoinFormat roundingMode(RoundingMode roundingMode) {
public MonetaryFormat roundingMode(RoundingMode roundingMode) {
if (roundingMode == this.roundingMode)
return this;
else
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
/**
* Don't display currency code when formatting. This configuration is not relevant for parsing.
*/
public CoinFormat noCode() {
public MonetaryFormat noCode() {
if (codes == null)
return this;
else
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, null, codeSeparator, codePrefixed);
}
@@ -231,64 +231,64 @@ public final class CoinFormat {
* @param code
* currency code
*/
public CoinFormat code(int codeShift, String code) {
public MonetaryFormat code(int codeShift, String code) {
checkArgument(codeShift >= 0);
Map<Integer, String> codes = new HashMap<Integer, String>();
if (this.codes != null)
codes.putAll(this.codes);
codes.put(codeShift, code);
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups, shift,
roundingMode, codes, codeSeparator, codePrefixed);
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
/**
* Separator between currency code and formatted value. This configuration is not relevant for parsing.
*/
public CoinFormat codeSeparator(char codeSeparator) {
public MonetaryFormat codeSeparator(char codeSeparator) {
checkArgument(!Character.isDigit(codeSeparator));
checkArgument(codeSeparator > 0);
if (codeSeparator == this.codeSeparator)
return this;
else
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
/**
* Prefix formatted output by currency code. This configuration is not relevant for parsing.
*/
public CoinFormat prefixCode() {
public MonetaryFormat prefixCode() {
if (codePrefixed)
return this;
else
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, true);
}
/**
* Postfix formatted output with currency code. This configuration is not relevant for parsing.
*/
public CoinFormat postfixCode() {
public MonetaryFormat postfixCode() {
if (!codePrefixed)
return this;
else
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, false);
}
/**
* Configure this instance with values from a {@link Locale}.
*/
public CoinFormat withLocale(Locale locale) {
public MonetaryFormat withLocale(Locale locale) {
DecimalFormatSymbols dfs = new DecimalFormatSymbols(locale);
char negativeSign = dfs.getMinusSign();
char zeroDigit = dfs.getZeroDigit();
char decimalMark = dfs.getMonetaryDecimalSeparator();
return new CoinFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups, shift,
roundingMode, codes, codeSeparator, codePrefixed);
return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
shift, roundingMode, codes, codeSeparator, codePrefixed);
}
public CoinFormat() {
public MonetaryFormat() {
// defaults
this.negativeSign = '-';
this.positiveSign = 0; // none
@@ -306,7 +306,7 @@ public final class CoinFormat {
this.codePrefixed = true;
}
private CoinFormat(char negativeSign, char positiveSign, char zeroDigit, char decimalMark, int minDecimals,
private MonetaryFormat(char negativeSign, char positiveSign, char zeroDigit, char decimalMark, int minDecimals,
List<Integer> decimalGroups, int shift, RoundingMode roundingMode, Map<Integer, String> codes,
char codeSeparator, boolean codePrefixed) {
this.negativeSign = negativeSign;
@@ -323,28 +323,28 @@ public final class CoinFormat {
}
/**
* Format the given value to a human readable form.
* Format the given monetary value to a human readable form.
*/
public CharSequence format(Monetary coin) {
public CharSequence format(Monetary monetary) {
// preparation
int maxDecimals = minDecimals;
if (decimalGroups != null)
for (int group : decimalGroups)
maxDecimals += group;
checkState(maxDecimals <= coin.smallestUnitExponent());
checkState(maxDecimals <= monetary.smallestUnitExponent());
// rounding
long satoshis = Math.abs(coin.getValue());
long precisionDivisor = checkedPow(10, coin.smallestUnitExponent() - shift - maxDecimals);
long satoshis = Math.abs(monetary.getValue());
long precisionDivisor = checkedPow(10, monetary.smallestUnitExponent() - shift - maxDecimals);
satoshis = checkedMultiply(divide(satoshis, precisionDivisor, roundingMode), precisionDivisor);
// shifting
long shiftDivisor = checkedPow(10, coin.smallestUnitExponent() - shift);
long shiftDivisor = checkedPow(10, monetary.smallestUnitExponent() - shift);
long numbers = satoshis / shiftDivisor;
long decimals = satoshis % shiftDivisor;
// formatting
String decimalsStr = String.format(Locale.US, "%0" + (coin.smallestUnitExponent() - shift) + "d", decimals);
String decimalsStr = String.format(Locale.US, "%0" + (monetary.smallestUnitExponent() - shift) + "d", decimals);
StringBuilder str = new StringBuilder(decimalsStr);
while (str.length() > minDecimals && str.charAt(str.length() - 1) == '0')
str.setLength(str.length() - 1); // trim trailing zero
@@ -362,7 +362,7 @@ public final class CoinFormat {
if (str.length() > 0)
str.insert(0, decimalMark);
str.insert(0, numbers);
if (coin.getValue() < 0)
if (monetary.getValue() < 0)
str.insert(0, negativeSign);
else if (positiveSign != 0)
str.insert(0, positiveSign);
@@ -381,7 +381,7 @@ public final class CoinFormat {
int offset = zeroDigit - '0';
for (int d = 0; d < str.length(); d++) {
char c = str.charAt(d);
if(Character.isDigit(c))
if (Character.isDigit(c))
str.setCharAt(d, (char) (c + offset));
}
}

46
core/src/test/java/com/google/bitcoin/utils/CoinFormatTest.java → core/src/test/java/com/google/bitcoin/utils/MonetaryFormatTest.java
View File

@@ -16,8 +16,8 @@
package com.google.bitcoin.utils;
import static com.google.bitcoin.core.Coin.COIN;
import static com.google.bitcoin.core.Coin.CENT;
import static com.google.bitcoin.core.Coin.COIN;
import static com.google.bitcoin.core.Coin.SATOSHI;
import static com.google.bitcoin.core.Coin.ZERO;
import static org.junit.Assert.assertEquals;
@@ -28,9 +28,9 @@ import org.junit.Test;
import com.google.bitcoin.core.Coin;
public class CoinFormatTest {
public class MonetaryFormatTest {
private static final CoinFormat NO_CODE = CoinFormat.BTC.noCode();
private static final MonetaryFormat NO_CODE = MonetaryFormat.BTC.noCode();
@Test
public void testSigns() throws Exception {
@@ -210,30 +210,30 @@ public class CoinFormatTest {
@Test
public void standardCodes() throws Exception {
assertEquals("BTC 0.00", CoinFormat.BTC.format(Coin.ZERO).toString());
assertEquals("mBTC 0.00", CoinFormat.MBTC.format(Coin.ZERO).toString());
assertEquals("µBTC 0", CoinFormat.UBTC.format(Coin.ZERO).toString());
assertEquals("BTC 0.00", MonetaryFormat.BTC.format(Coin.ZERO).toString());
assertEquals("mBTC 0.00", MonetaryFormat.MBTC.format(Coin.ZERO).toString());
assertEquals("µBTC 0", MonetaryFormat.UBTC.format(Coin.ZERO).toString());
}
@Test
public void customCode() throws Exception {
assertEquals("dBTC 0", CoinFormat.UBTC.code(1, "dBTC").shift(1).format(Coin.ZERO).toString());
assertEquals("dBTC 0", MonetaryFormat.UBTC.code(1, "dBTC").shift(1).format(Coin.ZERO).toString());
}
@Test
public void codeOrientation() throws Exception {
assertEquals("BTC 0.00", CoinFormat.BTC.prefixCode().format(Coin.ZERO).toString());
assertEquals("0.00 BTC", CoinFormat.BTC.postfixCode().format(Coin.ZERO).toString());
assertEquals("BTC 0.00", MonetaryFormat.BTC.prefixCode().format(Coin.ZERO).toString());
assertEquals("0.00 BTC", MonetaryFormat.BTC.postfixCode().format(Coin.ZERO).toString());
}
@Test
public void codeSeparator() throws Exception {
assertEquals("BTC@0.00", CoinFormat.BTC.codeSeparator('@').format(Coin.ZERO).toString());
assertEquals("BTC@0.00", MonetaryFormat.BTC.codeSeparator('@').format(Coin.ZERO).toString());
}
@Test(expected = NumberFormatException.class)
public void missingCode() throws Exception {
CoinFormat.UBTC.shift(1).format(Coin.ZERO);
MonetaryFormat.UBTC.shift(1).format(Coin.ZERO);
}
@Test
@@ -257,19 +257,19 @@ public class CoinFormatTest {
assertEquals(Coin.CENT, NO_CODE.parse(".01"));
assertEquals(Coin.MILLICOIN, CoinFormat.MBTC.parse("1"));
assertEquals(Coin.MILLICOIN, CoinFormat.MBTC.parse("1.0"));
assertEquals(Coin.MILLICOIN, CoinFormat.MBTC.parse("01.0000000000"));
assertEquals(Coin.MILLICOIN, CoinFormat.MBTC.positiveSign('+').parse("+1.0"));
assertEquals(Coin.MILLICOIN.negate(), CoinFormat.MBTC.parse("-1"));
assertEquals(Coin.MILLICOIN.negate(), CoinFormat.MBTC.parse("-1.0"));
assertEquals(Coin.MILLICOIN, MonetaryFormat.MBTC.parse("1"));
assertEquals(Coin.MILLICOIN, MonetaryFormat.MBTC.parse("1.0"));
assertEquals(Coin.MILLICOIN, MonetaryFormat.MBTC.parse("01.0000000000"));
assertEquals(Coin.MILLICOIN, MonetaryFormat.MBTC.positiveSign('+').parse("+1.0"));
assertEquals(Coin.MILLICOIN.negate(), MonetaryFormat.MBTC.parse("-1"));
assertEquals(Coin.MILLICOIN.negate(), MonetaryFormat.MBTC.parse("-1.0"));
assertEquals(Coin.MICROCOIN, CoinFormat.UBTC.parse("1"));
assertEquals(Coin.MICROCOIN, CoinFormat.UBTC.parse("1.0"));
assertEquals(Coin.MICROCOIN, CoinFormat.UBTC.parse("01.0000000000"));
assertEquals(Coin.MICROCOIN, CoinFormat.UBTC.positiveSign('+').parse("+1.0"));
assertEquals(Coin.MICROCOIN.negate(), CoinFormat.UBTC.parse("-1"));
assertEquals(Coin.MICROCOIN.negate(), CoinFormat.UBTC.parse("-1.0"));
assertEquals(Coin.MICROCOIN, MonetaryFormat.UBTC.parse("1"));
assertEquals(Coin.MICROCOIN, MonetaryFormat.UBTC.parse("1.0"));
assertEquals(Coin.MICROCOIN, MonetaryFormat.UBTC.parse("01.0000000000"));
assertEquals(Coin.MICROCOIN, MonetaryFormat.UBTC.positiveSign('+').parse("+1.0"));
assertEquals(Coin.MICROCOIN.negate(), MonetaryFormat.UBTC.parse("-1"));
assertEquals(Coin.MICROCOIN.negate(), MonetaryFormat.UBTC.parse("-1.0"));
assertEquals(Coin.CENT, NO_CODE.withLocale(new Locale("hi", "IN")).parse(".०१")); // Devanagari
}

4
wallettemplate/src/main/java/wallettemplate/MainController.java
View File

@@ -2,7 +2,7 @@ package wallettemplate;
import com.google.bitcoin.core.Coin;
import com.google.bitcoin.core.DownloadListener;
import com.google.bitcoin.utils.CoinFormat;
import com.google.bitcoin.utils.MonetaryFormat;
import com.subgraph.orchid.TorClient;
import com.subgraph.orchid.TorInitializationListener;
import javafx.animation.FadeTransition;
@@ -45,7 +45,7 @@ public class MainController {
public void onBitcoinSetup() {
model.setWallet(bitcoin.wallet());
addressControl.addressProperty().bind(model.addressProperty());
balance.textProperty().bind(EasyBind.map(model.balanceProperty(), coin -> CoinFormat.BTC.noCode().format(coin).toString()));
balance.textProperty().bind(EasyBind.map(model.balanceProperty(), coin -> MonetaryFormat.BTC.noCode().format(coin).toString()));
// Don't let the user click send money when the wallet is empty.
sendMoneyOutBtn.disableProperty().bind(model.balanceProperty().isEqualTo(Coin.ZERO));