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

fix null pointer, cleanups

Browse source
This commit is contained in:
Manfred Karrer 2016-03-11 10:24:13 +01:00
parent 9cb9d0f88c
commit 546b6f7510
4 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/io/bitsquare/payment/PaymentAccountFactory.java
View file

@ -17,11 +17,10 @@
package io.bitsquare.payment; package io.bitsquare.payment;
import io.bitsquare.common.persistance.Persistable;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public abstract class PaymentAccountFactory implements Persistable { public class PaymentAccountFactory {
private static final Logger log = LoggerFactory.getLogger(PaymentAccountFactory.class); private static final Logger log = LoggerFactory.getLogger(PaymentAccountFactory.class);
public static PaymentAccount getPaymentAccount(PaymentMethod paymentMethod) { public static PaymentAccount getPaymentAccount(PaymentMethod paymentMethod) {

5
gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
View file

@ -271,7 +271,10 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
}; };
model.dataModel.feeFromFundingTxProperty.addListener(feeFromFundingTxListener); model.dataModel.feeFromFundingTxProperty.addListener(feeFromFundingTxListener);
if (spinner != null && takeOfferButton.isVisible()) if (offerAvailabilitySpinner != null && offerAvailabilitySpinner.isVisible())
offerAvailabilitySpinner.setProgress(-1);
if (spinner != null && spinner.isVisible())
spinner.setProgress(-1); spinner.setProgress(-1);
} }

1
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java
View file

@ -73,5 +73,4 @@ public class TacWindow extends Overlay<TacWindow> {
protected void onShow() { protected void onShow() {
display(); display();
} }
} }

3
network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
View file

@ -442,7 +442,8 @@ public class P2PDataStorage implements MessageListener, ConnectionListener {
else else
result = expirableMailboxStoragePayload.receiverPubKeyForRemoveOperation.equals(protectedStorageEntry.ownerPubKey); result = expirableMailboxStoragePayload.receiverPubKeyForRemoveOperation.equals(protectedStorageEntry.ownerPubKey);
} else { } else {
result = protectedStorageEntry.getStoragePayload().getOwnerPubKey().equals(protectedStorageEntry.ownerPubKey); result = protectedStorageEntry != null && protectedStorageEntry.getStoragePayload() != null &&
protectedStorageEntry.getStoragePayload().getOwnerPubKey().equals(protectedStorageEntry.ownerPubKey);
} }
if (!result) if (!result)