mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
Manfred Karrer 2016-03-11 00:03:31 +01:00
parent bab70abf9e
commit 42c225f14f
8 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/io/bitsquare/app/Log.java
View File

@ -63,7 +63,7 @@ public class Log {
logbackLogger = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
//TODO for now use always trace
logbackLogger.setLevel(useDetailedLogging ? Level.TRACE : Level.TRACE);
logbackLogger.setLevel(useDetailedLogging ? Level.TRACE : Level.INFO);
// logbackLogger.setLevel(useDetailedLogging ? Level.TRACE : Level.DEBUG);
logbackLogger.addAppender(appender);
}

2
core/src/main/java/io/bitsquare/payment/OKPayAccountContractData.java
View File

@ -25,8 +25,6 @@ public final class OKPayAccountContractData extends PaymentAccountContractData {
private String accountNr;
// TODO refactor PaymentAccountContractData to avoid null values (countryCode, country, selectedTradeCountry)
public OKPayAccountContractData(String paymentMethod, String id, int maxTradePeriod) {
super(paymentMethod, id, maxTradePeriod);
}

3
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/SetupDepositBalanceListener.java
View File

@ -95,7 +95,8 @@ public class SetupDepositBalanceListener extends TradeTask {
trade.setState(Trade.State.DEPOSIT_SEEN_IN_NETWORK);
} else if (tradeState.getPhase() == Trade.Phase.PREPARATION) {
processModel.getTradeManager().removePreparedTrade(trade);
} else if (tradeState.getPhase().ordinal() < Trade.Phase.DEPOSIT_PAID.ordinal()) { // TODO need to evaluate if that is correct
} else if (tradeState.getPhase().ordinal() < Trade.Phase.DEPOSIT_PAID.ordinal()) {
// TODO need to evaluate if that is correct
processModel.getTradeManager().addTradeToFailedTrades(trade);
}
}

2
core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/offerer/VerifyTakeOfferFeePayment.java
View File

@ -34,7 +34,7 @@ public class VerifyTakeOfferFeePayment extends TradeTask {
protected void run() {
try {
runInterceptHook();
//TODO mocked yet, need a confidence listeners
//TODO missing impl.
// int numOfPeersSeenTx = processModel.getWalletService().getNumOfPeersSeenTx(processModel.getTakeOfferFeeTxId());
/* if (numOfPeersSeenTx > 2) {
resultHandler.handleResult();

10
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View File

@ -163,17 +163,11 @@ public class BitsquareApp extends Application {
primaryStage.setOnCloseRequest(event -> {
event.consume();
if (BitsquareApp.IS_RELEASE_VERSION)
stop(); // systemTray.hideStage(); TODO issues with some linux systems (https://github.com/bitsquare/bitsquare/issues/350)
else
stop();
stop();
});
scene.addEventHandler(KeyEvent.KEY_RELEASED, keyEvent -> {
if (new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) {
if (BitsquareApp.IS_RELEASE_VERSION)
stop(); //systemTray.hideStage(); TODO issues with some linux systems (https://github.com/bitsquare/bitsquare/issues/350)
else
stop();
stop();
} else if (new KeyCodeCombination(KeyCode.Q, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) {
stop();
} else if (new KeyCodeCombination(KeyCode.E, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) {

2
gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferView.java
View File

@ -370,7 +370,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
// called form parent as the view does not get notified when the tab is closed
public void onClose() {
// TODO need other implementation as it is displayed laso if there are old funds in the wallet
// TODO need other implementation as it is displayed also if there are old funds in the wallet
/*
if (model.dataModel.isWalletFunded.get())
new Popup().warning("You have already funds paid in.\nIn the <Funds/Open for withdrawal> section you can withdraw those funds.").show();*/

4
gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java
View File

@ -734,8 +734,8 @@ public abstract class Overlay<T extends Overlay> {
}
protected void setTruncatedMessage() {
if (message != null && message.length() > 1200)
truncatedMessage = StringUtils.abbreviate(message, 1200);
if (message != null && message.length() > 1500)
truncatedMessage = StringUtils.abbreviate(message, 1500);
else
truncatedMessage = message;
}

15
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java
View File

@ -20,12 +20,12 @@ public class TacWindow extends Overlay<TacWindow> {
public TacWindow(Preferences preferences) {
this.preferences = preferences;
type = Type.Attention;
width = 800;
}
public void showIfNeeded() {
if (!preferences.getTacAccepted() && !BitsquareApp.DEV_MODE) {
// TODO add link: https://bitsquare.io/arbitration_system.pdf
headLine("USER AGREEMENT");
headLine("User agreement");
String text = "1. This software is experimental and provided \"as is\", without warranty of any kind, " +
"express or implied, including but not limited to the warranties of " +
"merchantability, fitness for a particular purpose and non-infringement.\n" +
@ -33,9 +33,14 @@ public class TacWindow extends Overlay<TacWindow> {
"liability, whether in an action of contract, tort or otherwise, " +
"arising from, out of or in connection with the software or the use or other dealings in the software.\n\n" +
"2. The user is responsible to use the software in compliance with local laws.\n\n" +
"3. The user confirms that he has read and agreed to the rules defined in our " +
"Wiki regrading the dispute process\n" +
"(https://github.com/bitsquare/bitsquare/wiki/Arbitration-system).";
"3. The user confirms that he has read and agreed to the rules regrading the dispute process:\n" +
" - You must finalize trades within the maximum duration specified for each payment method.\n" +
" - You must enter the correct reference text for your payment transfers.\n" +
" - You must cooperate with the arbitrator during the arbitration process.\n" +
" - You must reply within 48 hours to each arbitrator inquiry.\n" +
" - Failure to follow the above requirements may result in loss of your security deposit.\n\n" +
"For more details and a general overview please read the full documentation about the " +
"arbitration system and the dispute process at: https://bitsquare.io/arbitration_system.pdf";
message(text);
actionButtonText("I agree");
closeButtonText("I disagree and quit");