Prevent deletion of offer when edited

This commit is contained in:
Christoph Atteneder 2018-04-17 17:27:38 +02:00
parent 94fc874383
commit 8c2cb14b12
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
2 changed files with 17 additions and 14 deletions

View file

@ -158,19 +158,14 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
private void onActivateOpenOffer(OpenOffer openOffer) {
if (model.isBootstrapped()) {
try {
model.onActivateOpenOffer(openOffer,
() -> {
log.debug("Activate offer was successful");
},
(message) -> {
log.error(message);
new Popup<>().warning(Res.get("offerbook.activateOffer.failed", message)).show();
});
} catch (IllegalStateException exception) {
log.error(exception.getMessage());
new Popup<>().warning(Res.get("offerbook.activateOffer.failed", exception.getMessage())).show();
}
() -> {
log.debug("Activate offer was successful");
},
(message) -> {
log.error(message);
new Popup<>().warning(Res.get("offerbook.activateOffer.failed", message)).show();
});
} else {
new Popup<>().information(Res.get("popup.warning.notFullyConnected")).show();
}

View file

@ -51,7 +51,11 @@ class OpenOffersViewModel extends ActivatableWithDataModel<OpenOffersDataModel>
}
void onActivateOpenOffer(OpenOffer openOffer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
dataModel.onActivateOpenOffer(openOffer, resultHandler, errorMessageHandler);
try {
dataModel.onActivateOpenOffer(openOffer, resultHandler, errorMessageHandler);
} catch (IllegalStateException exception) {
errorMessageHandler.handleErrorMessage(exception.getMessage());
}
}
void onDeactivateOpenOffer(OpenOffer openOffer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
@ -59,7 +63,11 @@ class OpenOffersViewModel extends ActivatableWithDataModel<OpenOffersDataModel>
}
void onRemoveOpenOffer(OpenOffer openOffer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
dataModel.onRemoveOpenOffer(openOffer, resultHandler, errorMessageHandler);
try {
dataModel.onRemoveOpenOffer(openOffer, resultHandler, errorMessageHandler);
} catch (IllegalStateException exception) {
errorMessageHandler.handleErrorMessage(exception.getMessage());
}
}
public ObservableList<OpenOfferListItem> getList() {