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

reformat

Browse Source
This commit is contained in:
Manfred Karrer 2014-08-20 21:56:03 +02:00
parent 7e8ee84ed1
commit 0905fbd6b4
8 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -648,7 +648,7 @@ public class WalletFacade
Coin fee = FeePolicy.CREATE_OFFER_FEE.subtract(FeePolicy.TX_FEE);
log.trace("fee: " + fee.toFriendlyString());
tx.addOutput(fee, feePolicy.getAddressForCreateOfferFee());
// printInputs("payCreateOfferFee", tx);
// printInputs("payCreateOfferFee", tx);
Wallet.SendRequest sendRequest = Wallet.SendRequest.forTx(tx);
sendRequest.shuffleOutputs = false;
// we allow spending of unconfirmed tx (double spend risk is low and usability would suffer if we need to wait for 1 confirmation)

2
src/main/java/io/bitsquare/di/GuiceFXMLLoader.java
View File

@ -40,7 +40,7 @@ public class GuiceFXMLLoader
{
this.url = url;
// useCaching = false;
// useCaching = false;
isCached = useCaching && cachedGUIItems.containsKey(url);
if (!isCached)
{

2
src/main/java/io/bitsquare/gui/MainController.java
View File

@ -169,7 +169,7 @@ public class MainController implements Initializable, NavigationController
public void downloadComplete()
{
viewBuilder.loadingLabel.setText("Synchronise with network done.");
if (viewBuilder.networkSyncPane != null)
if (viewBuilder.networkSyncPane != null)
viewBuilder.networkSyncPane.downloadComplete();
}
});

4
src/main/java/io/bitsquare/gui/components/ValidatingTextField.java
View File

@ -102,8 +102,8 @@ public class ValidatingTextField extends TextField
{
return isValid;
}
///////////////////////////////////////////////////////////////////////////////////////////
// Private methods
///////////////////////////////////////////////////////////////////////////////////////////

2
src/main/java/io/bitsquare/gui/components/btc/BalanceTextField.java
View File

@ -106,7 +106,7 @@ public class BalanceTextField extends AnchorPane
{
return balance;
}
///////////////////////////////////////////////////////////////////////////////////////////
// Private methods

9
src/main/java/io/bitsquare/gui/market/createOffer/CreateOfferView.fxml
View File

@ -8,7 +8,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="rootContainer" prefHeight="500" prefWidth="800" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0"
AnchorPane.topAnchor="10.0" xmlns="http://javafx.com/javafx/8" fx:controller="io.bitsquare.gui.market.createOffer.CreateOfferController" xmlns:fx="http://javafx.com/fxml/1" >
AnchorPane.topAnchor="10.0" xmlns="http://javafx.com/javafx/8" fx:controller="io.bitsquare.gui.market.createOffer.CreateOfferController" xmlns:fx="http://javafx.com/fxml/1">
<GridPane hgap="5.0" vgap="5.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0">
@ -25,7 +25,7 @@
</Label>
</Pane>
<Label GridPane.rowIndex="1" fx:id="buyLabel" />
<Label GridPane.rowIndex="1" fx:id="buyLabel"/>
<HBox GridPane.rowIndex="1" GridPane.columnIndex="1" spacing="5" GridPane.hgrow="NEVER" alignment="CENTER_LEFT">
<ValidatingTextField fx:id="amountTextField" prefWidth="70.0" alignment="CENTER_RIGHT"/>
<Label text="BTC for:"/>
@ -64,7 +64,7 @@
<!-- button -->
<VSpacer GridPane.rowIndex="7" prefHeight="10"/>
<Button GridPane.rowIndex="8" GridPane.columnIndex="1" fx:id="placeOfferButton" onAction="#onPlaceOffer" disable="true" defaultButton="true" text="Place offer"/>
<Button GridPane.rowIndex="8" GridPane.columnIndex="1" fx:id="closeButton" onAction="#onClose" visible="false" defaultButton="true" focusTraversable="false" text="Close"/>
<Button GridPane.rowIndex="8" GridPane.columnIndex="1" fx:id="closeButton" onAction="#onClose" visible="false" defaultButton="true" focusTraversable="false" text="Close"/>
<!-- group -->
@ -116,7 +116,6 @@
<TextField fx:id="acceptedLanguagesTextField" editable="false" focusTraversable="false" GridPane.columnIndex="1" GridPane.rowIndex="17"/>
<!-- on placed offer screen -->
<Label fx:id="txTitleLabel" text="Transaction ID:" visible="false" GridPane.rowIndex="14"/>
<TextField fx:id="transactionIdTextField" visible="false" editable="false" focusTraversable="false" GridPane.columnIndex="1" GridPane.rowIndex="14"/>
@ -128,7 +127,7 @@
</ConfidenceProgressIndicator>
<Label fx:id="confirmationLabel" text="Checking confirmations..." visible="false" GridPane.columnIndex="3" GridPane.rowIndex="14"/>
<columnConstraints>
<ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES"/>
<ColumnConstraints hgrow="ALWAYS" minWidth="400"/>

4
src/main/java/io/bitsquare/gui/market/orderbook/OrderBookController.java
View File

@ -92,7 +92,7 @@ public class OrderBookController implements Initializable, ChildController
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private OrderBookController(OrderBook orderBook, User user, MessageFacade messageFacade, WalletFacade walletFacade, Settings settings, Persistence persistence)
private OrderBookController(OrderBook orderBook, User user, MessageFacade messageFacade, WalletFacade walletFacade, Settings settings, Persistence persistence)
{
this.orderBook = orderBook;
this.user = user;
@ -100,7 +100,7 @@ public class OrderBookController implements Initializable, ChildController
this.walletFacade = walletFacade;
this.settings = settings;
this.persistence = persistence;
this.orderBookFilter = new OrderBookFilter();
}

4
src/main/java/io/bitsquare/gui/util/BtcValidator.java
View File

@ -40,7 +40,7 @@ public class BtcValidator extends NumberValidator
.and(validateIfNotFractionalBtcValue(input))
.and(validateIfNotExceedsMaxBtcValue(input));
}
return result;
}
@ -54,7 +54,7 @@ public class BtcValidator extends NumberValidator
{
this.externalValidationResult = externalValidationResult;
}
///////////////////////////////////////////////////////////////////////////////////////////
// Protected methods