Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-09-17 11:34:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Misc. cleanups

Browse source
This commit is contained in:
Manfred Karrer 2016-01-21 13:08:40 +01:00
parent b5f22fdcdc
commit 8aee8b617d
7 changed files with 33 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gui/src/main/java/io/bitsquare/gui/components/confidence/skin/ConfidenceProgressIndicatorSkin.java
View file

@ -201,8 +201,7 @@ public class ConfidenceProgressIndicatorSkin extends BehaviorSkinBase<Confidence
}
if (spinner != null) {
if (getSkinnable().impl_isTreeVisible() && getSkinnable().getScene() != null) {
} else {
if (!(getSkinnable().impl_isTreeVisible() && getSkinnable().getScene() != null)) {
getChildren().remove(spinner);
spinner = null;
timelineNulled = true;
@ -259,8 +258,6 @@ public class ConfidenceProgressIndicatorSkin extends BehaviorSkinBase<Confidence
spinner = new IndeterminateSpinner(control, this, spinEnabled.get(), progressColor.get());
getChildren().clear();
getChildren().add(spinner);
if (getSkinnable().impl_isTreeVisible()) {
}
} else {
// clean up after spinner
if (spinner != null) {

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
View file

@ -45,7 +45,7 @@ class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataMod
String getAmount(FailedTradesListItem item) {
if (item != null && item.getTrade() instanceof Trade)
return formatter.formatCoinWithCode(((Trade) item.getTrade()).getTradeAmount());
return formatter.formatCoinWithCode(item.getTrade().getTradeAmount());
else
return "";
}
@ -56,7 +56,7 @@ class FailedTradesViewModel extends ActivatableWithDataModel<FailedTradesDataMod
String getVolume(FailedTradesListItem item) {
if (item != null && item.getTrade() instanceof Trade)
return formatter.formatFiatWithCode(((Trade) item.getTrade()).getTradeVolume());
return formatter.formatFiatWithCode(item.getTrade().getTradeVolume());
else
return "";
}

2
gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
View file

@ -27,8 +27,6 @@ import static io.bitsquare.app.BitsquareEnvironment.*;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.springframework.core.env.PropertySource.named;
import static org.springframework.core.env.StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME;
import static org.springframework.core.env.StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME;
public class BitsquareEnvironmentTests {