mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup, improve logging

Browse Source
This commit is contained in:
Manfred Karrer 2014-11-20 00:09:27 +01:00
parent a23277a527
commit 5b5bacc397
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/bitsquare/btc/FeePolicy.java
View File

@ -33,7 +33,7 @@ public class FeePolicy {
// TODO: Change REGISTRATION_FEE to 0.00001 (See https://github.com/bitsquare/bitsquare/issues/228) // TODO: Change REGISTRATION_FEE to 0.00001 (See https://github.com/bitsquare/bitsquare/issues/228)
public static final Coin REGISTRATION_FEE = TX_FEE.add(TX_FEE); public static final Coin REGISTRATION_FEE = TX_FEE.add(TX_FEE);
public static final Coin CREATE_OFFER_FEE = Coin.valueOf(20000); // 0.00002 BTC public static final Coin CREATE_OFFER_FEE = Coin.valueOf(20000); // 0.0002 BTC
public static final Coin TAKE_OFFER_FEE = CREATE_OFFER_FEE; public static final Coin TAKE_OFFER_FEE = CREATE_OFFER_FEE;
private final BitcoinNetwork bitcoinNetwork; private final BitcoinNetwork bitcoinNetwork;

1
src/main/java/io/bitsquare/btc/WalletService.java
View File

@ -242,6 +242,7 @@ public class WalletService {
@Override @Override
public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) { public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
log.trace("onTransactionConfidenceChanged " + tx.getHashAsString());
notifyConfidenceListeners(tx); notifyConfidenceListeners(tx);
} }

5
src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java
View File

@ -159,6 +159,8 @@ class PendingTradesModel extends UIModel {
Trade trade = getTrade(); Trade trade = getTrade();
trade.stateProperty().addListener(stateChangeListener); trade.stateProperty().addListener(stateChangeListener);
tradeState.set(trade.stateProperty().get()); tradeState.set(trade.stateProperty().get());
log.trace("selectTrade trade.stateProperty().get() " + trade.stateProperty().get());
if (trade.getDepositTx() != null) if (trade.getDepositTx() != null)
txId.set(trade.getDepositTx().getHashAsString()); txId.set(trade.getDepositTx().getHashAsString());
@ -304,7 +306,8 @@ class PendingTradesModel extends UIModel {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
private void updateConfidence(TransactionConfidence confidence) { private void updateConfidence(TransactionConfidence confidence) {
log.debug("confidence " + confidence); log.trace("updateConfidence confidence " + confidence);
log.trace("updateConfidence getTrade().getState() " + getTrade().getState());
if (confidence != null && if (confidence != null &&
confidence.getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING confidence.getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING
&& (getTrade().getState() == Trade.State.DEPOSIT_PUBLISHED || && (getTrade().getState() == Trade.State.DEPOSIT_PUBLISHED ||

9
src/main/java/io/bitsquare/util/Utilities.java
View File

@ -17,8 +17,6 @@
package io.bitsquare.util; package io.bitsquare.util;
import io.bitsquare.BitsquareException;
import com.google.gson.FieldNamingPolicy; import com.google.gson.FieldNamingPolicy;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
@ -31,7 +29,6 @@ import java.io.ObjectOutputStream;
import java.io.Serializable; import java.io.Serializable;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException;
import java.util.function.Function; import java.util.function.Function;
@ -141,14 +138,14 @@ public class Utilities {
printElapsedTime(""); printElapsedTime("");
} }
public static void openURI(URI uri) throws BitsquareException { public static void openURI(URI uri) throws Exception {
// On Linux Desktop is poorly implemented. // On Linux Desktop is poorly implemented.
// See https://stackoverflow.com/questions/18004150/desktop-api-is-not-supported-on-the-current-platform // See https://stackoverflow.com/questions/18004150/desktop-api-is-not-supported-on-the-current-platform
if (!DesktopApi.browse(uri)) if (!DesktopApi.browse(uri))
throw new BitsquareException("Failed to open URI: " + uri.toString()); throw new Exception("Failed to open URI: " + uri.toString());
} }
public static void openWebPage(String target) throws URISyntaxException, IOException { public static void openWebPage(String target) throws Exception {
openURI(new URI(target)); openURI(new URI(target));
} }

2
src/main/java/net/mightypork/rpack/utils/DesktopApi.java
View File

@ -13,7 +13,7 @@ import java.util.List;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
// Taken form https://stackoverflow.com/questions/18004150/desktop-api-is-not-supported-on-the-current-platform
public class DesktopApi { public class DesktopApi {
private static final Logger log = LoggerFactory.getLogger(DesktopApi.class); private static final Logger log = LoggerFactory.getLogger(DesktopApi.class);