Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-17 19:02:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

added jars, fixed tests

Browse source
This commit is contained in:
Manfred Karrer 2015-11-03 15:34:04 +01:00
parent 3711519e3a
commit c5ee2c9186
36 changed files with 341 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.java
View file

@ -82,8 +82,6 @@ public class DisputesView extends ActivatableViewAndModel<TabPane, Activatable>
boolean isArbitrator = arbitratorManager.getArbitratorsObservableMap().values().stream()
.filter(e -> e.getPubKeyRing() != null && e.getPubKeyRing().equals(keyRing.getPubKeyRing()))
.findAny().isPresent();
log.debug("arbitratorManager.getArbitratorsObservableMap() " + arbitratorManager.getArbitratorsObservableMap().size());
log.debug("updateArbitratorsDisputesTabDisableState isArbitrator=" + isArbitrator);
arbitratorsDisputesTab.setDisable(!isArbitrator);
if (arbitratorsDisputesTab.getContent() != null)
arbitratorsDisputesTab.getContent().setDisable(!isArbitrator);

1
gui/src/main/java/io/bitsquare/gui/main/market/MarketViewModel.java
View file

@ -68,7 +68,6 @@ class MarketViewModel extends ActivatableViewModel {
protected void activate() {
offerBookListItems.addListener(listChangeListener);
offerBook.fillOfferBookListItems();
//updateChartData(offerBookListItems);
}
@Override

8
gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookViewModel.java
View file

@ -122,8 +122,7 @@ class OfferBookViewModel extends ActivatableViewModel {
public void onSetTradeCurrency(TradeCurrency tradeCurrency) {
this.tradeCurrency = tradeCurrency;
tradeCurrencyCode.set(tradeCurrency.getCode());
/* if (!(tradeCurrency instanceof AllTradeCurrenciesEntry))*/
//offerBook.getOffers(tradeCurrencyCode.get());
filterList();
}
public void onSetPaymentMethod(PaymentMethod paymentMethod) {
@ -273,11 +272,12 @@ class OfferBookViewModel extends ActivatableViewModel {
filteredItems.setPredicate(offerBookListItem -> {
Offer offer = offerBookListItem.getOffer();
boolean directionResult = offer.getDirection() != direction;
boolean currencyResult = offer.getCurrencyCode().equals(tradeCurrency.getCode());
boolean paymentMethodResult = true;
if (!(paymentMethod instanceof AllPaymentMethodsEntry))
if (!(paymentMethod instanceof AllPaymentMethodsEntry))
paymentMethodResult = offer.getPaymentMethod().equals(paymentMethod);
return directionResult && paymentMethodResult;
return directionResult && currencyResult && paymentMethodResult;
});
}