Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
Conflicts:
	src/main/resources/i18n/ja/viewer.properties
  • Loading branch information
langerhans committed Mar 15, 2014
2 parents 26ad84e + b1ce7d5 commit 587a420
Show file tree
Hide file tree
Showing 9 changed files with 185 additions and 161 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.multibit</groupId>
<artifactId>multidoge</artifactId>
<version>0.1.1</version>
<version>0.1.2</version>
<name>MultiDoge</name>
<description>A Java Swing client for Dogecoin</description>
<url>https://multidoge.org</url>
Expand Down
2 changes: 1 addition & 1 deletion release_notes.txt
View file
@@ -1,6 +1,6 @@
MultiDoge release notes:

19 Feb 2014: 0.1.1
23 Feb 2014: 0.1.1
+ Saves window state on close so size and position are restored at launch.
+ Option to minimize to tray. Stays in dock on OS X because Apple has no API to change that dynamically. On Linux the icon lacks transparanecy due to an internal Java bug. Sorry, can't change that :/
+ Only allow nodes with more than 105000 blocks to connect. Prevents running on the wrong side of the recent fork.
Expand Down
2 changes: 1 addition & 1 deletion release_notes_full.txt
View file
@@ -1,6 +1,6 @@
MultiDoge release notes:

19 Feb 2014: 0.1.1
23 Feb 2014: 0.1.1
+ Saves window state on close so size and position are restored at launch.
+ Option to minimize to tray. Stays in dock on OS X because Apple has no API to change that dynamically. On Linux the icon lacks transparanecy due to an internal Java bug. Sorry, can't change that :/
+ Only allow nodes with more than 105000 blocks to connect. Prevents running on the wrong side of the recent fork.
Expand Down
51 changes: 25 additions & 26 deletions src/main/java/org/multibit/exchange/TickerTimerTask.java
View file
Expand Up @@ -146,19 +146,19 @@ public void run() {

for (CurrencyPair loopSymbolPair : exchangeSymbols) {
if (ExchangeData.OPEN_EXCHANGE_RATES_EXCHANGE_NAME.equals(shortExchangeName)) {
if (loopSymbolPair.baseCurrency.equals(currency)) {
if (loopSymbolPair.baseSymbol.equals(currency)) {
getItFromTheServer = true;
invertedRates = true;
currencyPairToUse = loopSymbolPair;
break;
}
} else {
if ("BTC".equals(loopSymbolPair.baseCurrency) && loopSymbolPair.counterCurrency.equals(currency)) {
if ("BTC".equals(loopSymbolPair.baseSymbol) && loopSymbolPair.counterSymbol.equals(currency)) {
getItFromTheServer = true;
currencyPairToUse = loopSymbolPair;
break;
}
if ("BTC".equals(loopSymbolPair.counterCurrency) && loopSymbolPair.baseCurrency.equals(currency)) {
if ("BTC".equals(loopSymbolPair.baseSymbol) && loopSymbolPair.counterSymbol.equals(currency)) {
getItFromTheServer = true;
invertedRates = true;
currencyPairToUse = loopSymbolPair;
Expand All @@ -176,38 +176,37 @@ public void run() {

if (ExchangeData.OPEN_EXCHANGE_RATES_EXCHANGE_NAME.equals(shortExchangeName)) {
log.debug("Getting loopTicker for " + currency + " USD");
loopTicker = marketDataService.getTicker(currency, "USD");
loopTicker = marketDataService.getTicker(new CurrencyPair(currency, Currencies.USD));
System.out.println("loopTicker = " + loopTicker);
Ticker btcUsdTicker = null;
log.debug("Getting btcUsdTicker for BTC/USD");
btcUsdTicker = marketDataService.getTicker(Currencies.BTC, Currencies.USD);
btcUsdTicker = marketDataService.getTicker(new CurrencyPair(Currencies.BTC, Currencies.USD));
System.out.println("btcUsdTicker = " + btcUsdTicker);

BigMoney usdBtcRateMoney = btcUsdTicker.getLast();
BigMoney usdBtcRateMoney = BigMoney.of(CurrencyUnit.USD, btcUsdTicker.getLast());
BigDecimal usdBtcRate = null;
if (usdBtcRateMoney != null) {
usdBtcRate = usdBtcRateMoney.getAmount();
if (loopTicker.getLast() != null) {
last = loopTicker.getLast().dividedBy(usdBtcRate, RoundingMode.HALF_EVEN);
last = BigMoney.of(CurrencyUnit.USD,loopTicker.getLast()).dividedBy(usdBtcRate, RoundingMode.HALF_EVEN);
}
if (loopTicker.getBid() != null) {
bid = loopTicker.getBid().dividedBy(usdBtcRate, RoundingMode.HALF_EVEN);
bid = BigMoney.of(CurrencyUnit.USD,loopTicker.getBid()).dividedBy(usdBtcRate, RoundingMode.HALF_EVEN);
}
if (loopTicker.getAsk() != null) {
ask = loopTicker.getAsk().dividedBy(usdBtcRate, RoundingMode.HALF_EVEN);
ask = BigMoney.of(CurrencyUnit.USD,loopTicker.getAsk()).dividedBy(usdBtcRate, RoundingMode.HALF_EVEN);
}
}
} else {
log.debug("Getting ticker for " + currencyPairToUse.baseCurrency + " "
+ currencyPairToUse.counterCurrency);
loopTicker = marketDataService.getTicker(currencyPairToUse.baseCurrency,
currencyPairToUse.counterCurrency);
log.debug("Getting ticker for " + currencyPairToUse.baseSymbol + " "
+ currencyPairToUse.counterSymbol);
loopTicker = marketDataService.getTicker(currencyPairToUse);

log.debug("Got ticker for " + currencyPairToUse.baseCurrency + " "
+ currencyPairToUse.counterCurrency);
last = loopTicker.getLast();
bid = loopTicker.getBid();
ask = loopTicker.getAsk();
log.debug("Got ticker for " + currencyPairToUse.baseSymbol + " "
+ currencyPairToUse.counterSymbol);
last = BigMoney.of(CurrencyUnit.USD,loopTicker.getLast());
bid = BigMoney.of(CurrencyUnit.USD,loopTicker.getBid());
ask = BigMoney.of(CurrencyUnit.USD,loopTicker.getAsk());

if (invertedRates && !reverseRates) {
if (last != null && last.getAmount() != BigDecimal.ZERO) {
Expand All @@ -217,14 +216,14 @@ public void run() {
last = null;
}
if (bid != null && bid.getAmount() != BigDecimal.ZERO) {
bid = BigMoney.of(last.getCurrencyUnit(), BigDecimal.ONE.divide(bid.getAmount(),
bid = BigMoney.of(bid.getCurrencyUnit(), BigDecimal.ONE.divide(bid.getAmount(),
NUMBER_OF_SIGNIFICANT_DIGITS, BigDecimal.ROUND_HALF_EVEN));
} else {
bid = null;
}

if (ask != null && ask.getAmount() != BigDecimal.ZERO) {
ask = BigMoney.of(last.getCurrencyUnit(), BigDecimal.ONE.divide(ask.getAmount(),
ask = BigMoney.of(ask.getCurrencyUnit(), BigDecimal.ONE.divide(ask.getAmount(),
NUMBER_OF_SIGNIFICANT_DIGITS, BigDecimal.ROUND_HALF_EVEN));
} else {
ask = null;
Expand All @@ -234,18 +233,18 @@ public void run() {
if (invertedRates) {
if (reverseRates) {
// USD/ BTC, reciprocal rate
currency = currencyPairToUse.baseCurrency;
currency = currencyPairToUse.baseSymbol;
} else {
// BTC/ USD, reciprocal rate
currency = currencyPairToUse.counterCurrency;
currency = currencyPairToUse.counterSymbol;
}
} else {
if (reverseRates) {
// USD/ BTC, normal rate
currency = currencyPairToUse.baseCurrency;
currency = currencyPairToUse.baseSymbol;
} else {
// BTC/ USD, normal rate
currency = currencyPairToUse.counterCurrency;
currency = currencyPairToUse.counterSymbol;
}
}
}
Expand Down Expand Up @@ -308,8 +307,8 @@ public void createExchangeObjects(String newExchangeName) {
Collection<String> availableCurrencies = new java.util.TreeSet<String>();

for (int i = 0; i < exchangeSymbols.size(); i++) {
String baseCurrency = exchangeSymbols.get(i).baseCurrency;
String counterCurrency = exchangeSymbols.get(i).counterCurrency;
String baseCurrency = exchangeSymbols.get(i).baseSymbol;
String counterCurrency = exchangeSymbols.get(i).counterSymbol;

if (ExchangeData.OPEN_EXCHANGE_RATES_EXCHANGE_NAME.equals(newExchangeName)) {
if ("USD".equalsIgnoreCase(baseCurrency) && !"BTC".equalsIgnoreCase(counterCurrency)) {
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/multibit/viewsystem/swing/ColorAndFontConstants.java
View file
Expand Up @@ -62,6 +62,16 @@ private ColorAndFontConstants() {
public static void init() {
MULTIBIT_DEFAULT_FONT_NAME = UIManager.get("Label.font") == null ? Font.DIALOG : ((Font) UIManager.get("Label.font"))
.getFontName();

String[] availFonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
for (String fontName: availFonts)
{
if (fontName.equals("Comic Sans MS"))
{
MULTIBIT_DEFAULT_FONT_NAME = fontName;
break;
}
}
MULTIBIT_DEFAULT_FONT_STYLE = UIManager.get("Label.font") == null ? 0 : ((Font) UIManager.get("Label.font")).getStyle();
MULTIBIT_DEFAULT_FONT_SIZE = UIManager.get("Label.font") == null ? 13 : ((Font) UIManager.get("Label.font")).getSize() + 1;

Expand Down

0 comments on commit 587a420

Please sign in to comment.