Merge pull request #182 from cbeams/patch-2

This commit is contained in:
Chris Beams 2014-12-29 11:47:36 +01:00
commit 7015d42221
1 changed files with 5 additions and 25 deletions

View File

@ -5,14 +5,9 @@ import java.math.BigInteger;
public enum Denomination { public enum Denomination {
WEI(newBigInt(0)), WEI(newBigInt(0)),
ADA(newBigInt(3)),
BABBAGE(newBigInt(6)),
SHANNON(newBigInt(9)),
SZABO(newBigInt(12)), SZABO(newBigInt(12)),
FINNY(newBigInt(15)), FINNEY(newBigInt(15)),
ETHER(newBigInt(18)), ETHER(newBigInt(18));
EINSTEIN(newBigInt(21)),
DOUGLAS(newBigInt(42));
private BigInteger amount; private BigInteger amount;
@ -33,30 +28,15 @@ public enum Denomination {
} }
public static String toFriendlyString(BigInteger value) { public static String toFriendlyString(BigInteger value) {
if(value.compareTo(DOUGLAS.value()) == 1 || value.compareTo(DOUGLAS.value()) == 0) { if (value.compareTo(ETHER.value()) == 1 || value.compareTo(ETHER.value()) == 0) {
return Float.toString(value.divide(DOUGLAS.value()).floatValue()) + " DOUGLAS";
}
else if(value.compareTo(EINSTEIN.value()) == 1 || value.compareTo(EINSTEIN.value()) == 0) {
return Float.toString(value.divide(EINSTEIN.value()).floatValue()) + " EINSTEIN";
}
else if(value.compareTo(ETHER.value()) == 1 || value.compareTo(ETHER.value()) == 0) {
return Float.toString(value.divide(ETHER.value()).floatValue()) + " ETHER"; return Float.toString(value.divide(ETHER.value()).floatValue()) + " ETHER";
} }
else if(value.compareTo(FINNY.value()) == 1 || value.compareTo(FINNY.value()) == 0) { else if(value.compareTo(FINNEY.value()) == 1 || value.compareTo(FINNEY.value()) == 0) {
return Float.toString(value.divide(FINNY.value()).floatValue()) + " FINNY"; return Float.toString(value.divide(FINNEY.value()).floatValue()) + " FINNEY";
} }
else if(value.compareTo(SZABO.value()) == 1 || value.compareTo(SZABO.value()) == 0) { else if(value.compareTo(SZABO.value()) == 1 || value.compareTo(SZABO.value()) == 0) {
return Float.toString(value.divide(SZABO.value()).floatValue()) + " SZABO"; return Float.toString(value.divide(SZABO.value()).floatValue()) + " SZABO";
} }
else if(value.compareTo(SHANNON.value()) == 1 || value.compareTo(SHANNON.value()) == 0) {
return Float.toString(value.divide(SHANNON.value()).floatValue()) + " SHANNON";
}
else if(value.compareTo(BABBAGE.value()) == 1 || value.compareTo(BABBAGE.value()) == 0) {
return Float.toString(value.divide(BABBAGE.value()).floatValue()) + " BABBAGE";
}
else if(value.compareTo(ADA.value()) == 1 || value.compareTo(ADA.value()) == 0) {
return Float.toString(value.divide(ADA.value()).floatValue()) + " ADA";
}
else else
return Float.toString(value.divide(WEI.value()).floatValue()) + " WEI"; return Float.toString(value.divide(WEI.value()).floatValue()) + " WEI";
} }