Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-06 22:29:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add handlers for remove offer

Browse source
This commit is contained in:
Manfred Karrer 2015-03-08 00:52:36 +01:00
parent 3b35774b4b
commit 9e54279dd8
4 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
View file

@ -21,6 +21,8 @@ import io.bitsquare.offer.Direction;
import io.bitsquare.offer.Offer; import io.bitsquare.offer.Offer;
import io.bitsquare.trade.TradeManager; import io.bitsquare.trade.TradeManager;
import io.bitsquare.user.User; import io.bitsquare.user.User;
import io.bitsquare.util.task.FaultHandler;
import io.bitsquare.util.task.ResultHandler;
import com.google.inject.Inject; import com.google.inject.Inject;
@ -33,7 +35,11 @@ import javafx.collections.FXCollections;
import javafx.collections.MapChangeListener; import javafx.collections.MapChangeListener;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
class OffersDataModel implements Activatable, DataModel { class OffersDataModel implements Activatable, DataModel {
private static final Logger log = LoggerFactory.getLogger(OffersDataModel.class);
private final TradeManager tradeManager; private final TradeManager tradeManager;
private final User user; private final User user;
@ -71,8 +77,8 @@ class OffersDataModel implements Activatable, DataModel {
tradeManager.getOffers().removeListener(offerMapChangeListener); tradeManager.getOffers().removeListener(offerMapChangeListener);
} }
void removeOffer(OfferListItem item) { void removeOffer(Offer offer, ResultHandler resultHandler, FaultHandler faultHandler) {
tradeManager.requestRemoveOffer(item.getOffer()); tradeManager.requestRemoveOffer(offer, resultHandler, faultHandler);
} }

16
gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.portfolio.offer; package io.bitsquare.gui.main.portfolio.offer;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import com.google.inject.Inject; import com.google.inject.Inject;
@ -26,7 +27,11 @@ import viewfx.model.support.ActivatableWithDataModel;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
class OffersViewModel extends ActivatableWithDataModel<OffersDataModel> implements ViewModel { class OffersViewModel extends ActivatableWithDataModel<OffersDataModel> implements ViewModel {
private static final Logger log = LoggerFactory.getLogger(OffersViewModel.class);
private final BSFormatter formatter; private final BSFormatter formatter;
@ -40,10 +45,17 @@ class OffersViewModel extends ActivatableWithDataModel<OffersDataModel> implemen
void removeOffer(OfferListItem item) { void removeOffer(OfferListItem item) {
dataModel.removeOffer(item); dataModel.removeOffer(item.getOffer(),
() -> {
// visual feedback?
log.debug("Remove offer was successful");
},
(message, throwable) -> {
log.error(message);
Popups.openWarningPopup("Remove offer failed", message);
});
} }
public ObservableList<OfferListItem> getList() { public ObservableList<OfferListItem> getList() {
return dataModel.getList(); return dataModel.getList();
} }

2
gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
View file

@ -107,7 +107,7 @@ class OfferBookViewModel extends ActivatableWithDataModel<OfferBookDataModel> im
dataModel.removeOffer(offer, dataModel.removeOffer(offer,
() -> { () -> {
// visual feedback? // visual feedback?
log.debug("remove was successful"); log.debug("Remove offer was successful");
}, },
(message, throwable) -> { (message, throwable) -> {
log.error(message); log.error(message);

4
gui/src/main/java/io/bitsquare/trade/TradeManager.java
View file

@ -256,7 +256,9 @@ public class TradeManager {
public void onOfferAccepted(Offer offer) { public void onOfferAccepted(Offer offer) {
trade.setState(Trade.State.OFFERER_ACCEPTED); trade.setState(Trade.State.OFFERER_ACCEPTED);
persistPendingTrades(); persistPendingTrades();
requestRemoveOffer(offer); requestRemoveOffer(offer,
() -> log.debug("remove was successful"),
(message, throwable) -> log.error(message));
} }
@Override @Override