mirror of
https://github.com/haveno-dex/haveno.git
synced 2025-04-19 23:36:00 -04:00
Polish whitespace
Run "Reformat code" and "Optimize Imports" from within IDEA, cleaning up trailing whitespace and other issues.
This commit is contained in:
Chris Beams
parent
dfbe6973e7
commit
017ebb3f38
@ -93,7 +93,9 @@ public class AppModule extends BitsquareModule {
|
||||
return new TradeModule(properties);
|
||||
}
|
||||
|
||||
protected OfferModule offerModule() { return new TomP2POfferModule(properties); }
|
||||
protected OfferModule offerModule() {
|
||||
return new TomP2POfferModule(properties);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doClose(Injector injector) {
|
||||
|
||||
@ -24,19 +24,19 @@ lower gradient color on tab: dddddd
|
||||
-bs-grey: #666666;
|
||||
-bs-bg-grey: #dddddd;
|
||||
-bs-error-red: #dd0000;
|
||||
|
||||
|
||||
-fx-accent: #0f87c3;
|
||||
-fx-default-button: derive(-fx-accent,95%);
|
||||
-fx-default-button: derive(-fx-accent, 95%);
|
||||
-fx-focus-color: -fx-accent;
|
||||
-fx-faint-focus-color: #0f87c322;
|
||||
-fx-selection-bar: derive(-fx-accent,50%);
|
||||
-fx-selection-bar: derive(-fx-accent, 50%);
|
||||
}
|
||||
|
||||
|
||||
/* Splash */
|
||||
#splash {
|
||||
-fx-background-color: #ffffff;
|
||||
}
|
||||
|
||||
#splash-error-state-msg {
|
||||
-fx-text-fill: -bs-error-red;
|
||||
}
|
||||
@ -55,7 +55,6 @@ lower gradient color on tab: dddddd
|
||||
-fx-font-size: 18;
|
||||
}
|
||||
|
||||
|
||||
/* Main navigation */
|
||||
#nav-button {
|
||||
-fx-cursor: hand;
|
||||
@ -63,29 +62,31 @@ lower gradient color on tab: dddddd
|
||||
}
|
||||
|
||||
#nav-button .text {
|
||||
-fx-font-size: 10;
|
||||
-fx-font-size: 10;
|
||||
}
|
||||
|
||||
#nav-button:selected .text {
|
||||
-fx-font-size: 11;
|
||||
-fx-font-size: 11;
|
||||
-fx-font-weight: bold;
|
||||
-fx-fill: -fx-accent;
|
||||
}
|
||||
|
||||
#nav-button-label {
|
||||
-fx-font-size: 10;
|
||||
-fx-font-size: 10;
|
||||
}
|
||||
|
||||
#nav-balance-label {
|
||||
-fx-font-weight: bold;
|
||||
-fx-alignment: center;
|
||||
-fx-background-color: #dddddd;
|
||||
-fx-background-color: #dddddd;
|
||||
}
|
||||
|
||||
#nav-alert-label {
|
||||
-fx-font-weight: bold;
|
||||
-fx-font-size: 11;
|
||||
-fx-text-fill: white;
|
||||
-fx-font-weight: bold;
|
||||
-fx-font-size: 11;
|
||||
-fx-text-fill: white;
|
||||
}
|
||||
|
||||
.text-field:readonly {
|
||||
-fx-text-fill: #000000;
|
||||
-fx-background-color: #FAFAFA;
|
||||
@ -115,7 +116,6 @@ lower gradient color on tab: dddddd
|
||||
-fx-text-fill: black;
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
* *
|
||||
* Tooltip *
|
||||
@ -129,12 +129,11 @@ lower gradient color on tab: dddddd
|
||||
-fx-background-radius: 6px;
|
||||
-fx-background-insets: 0;
|
||||
-fx-padding: 0.667em 0.75em 0.667em 0.75em; /* 10px */
|
||||
-fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.5) , 10, 0.0 , 0 , 3 );
|
||||
-fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.5), 10, 0.0, 0, 3);
|
||||
-fx-font-size: 0.85em;
|
||||
}
|
||||
|
||||
|
||||
/* Same style like non editable textfield. But textfield spans a whole column in a grid, so we use generally
|
||||
/* Same style like non editable textfield. But textfield spans a whole column in a grid, so we use generally
|
||||
textfield */
|
||||
#label-with-background {
|
||||
-fx-background-color: #FAFAFA;
|
||||
@ -146,6 +145,7 @@ textfield */
|
||||
-fx-cursor: hand;
|
||||
-fx-text-fill: -fx-accent;
|
||||
}
|
||||
|
||||
#address-text-field:hover {
|
||||
-fx-text-fill: black;
|
||||
}
|
||||
@ -211,8 +211,6 @@ textfield */
|
||||
-fx-fill: black;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#form-header-text {
|
||||
-fx-font-weight: bold;
|
||||
-fx-font-size: 14;
|
||||
@ -277,26 +275,24 @@ textfield */
|
||||
-fx-text-fill: red;
|
||||
}
|
||||
|
||||
|
||||
/* Account */
|
||||
|
||||
#content-pane-top {
|
||||
-fx-background-color:
|
||||
#cfcfcf,
|
||||
linear-gradient(#cfcfcf 0%, #b5b5b5 100%),
|
||||
linear-gradient(#d3d3d3 0%, -bs-bg-grey 100%);
|
||||
-fx-background-insets: 0 0 0 0,0,1;
|
||||
-fx-background-color: #cfcfcf,
|
||||
linear-gradient(#cfcfcf 0%, #b5b5b5 100%),
|
||||
linear-gradient(#d3d3d3 0%, -bs-bg-grey 100%);
|
||||
-fx-background-insets: 0 0 0 0, 0, 1;
|
||||
}
|
||||
|
||||
#info-icon-label {
|
||||
-fx-font-size:16;
|
||||
-fx-font-size: 16;
|
||||
-fx-text-fill: #333000;
|
||||
}
|
||||
|
||||
/* Create offer */
|
||||
#direction-icon-label {
|
||||
-fx-font-weight:bold;
|
||||
-fx-font-size:16;
|
||||
-fx-font-weight: bold;
|
||||
-fx-font-size: 16;
|
||||
-fx-text-fill: -bs-grey;
|
||||
}
|
||||
|
||||
@ -314,32 +310,33 @@ textfield */
|
||||
#currency-info-label {
|
||||
-fx-border-radius: 0 4 4 0;
|
||||
-fx-padding: 4 4 4 4;
|
||||
-fx-background-color: #f6f6f6;
|
||||
-fx-background-color: #f6f6f6;
|
||||
-fx-border-color: #aaa;
|
||||
-fx-border-style: solid solid solid none;
|
||||
-fx-border-style: solid solid solid none;
|
||||
-fx-border-insets: 0 0 0 -2;
|
||||
}
|
||||
|
||||
#totals-separator {
|
||||
-fx-background: #AAAAAA;
|
||||
-fx-background: #AAAAAA;
|
||||
}
|
||||
|
||||
#payment-info {
|
||||
-fx-background-color: #f4f4f4;
|
||||
-fx-background-color: #f4f4f4;
|
||||
}
|
||||
|
||||
|
||||
/* Account setup */
|
||||
#wizard-title-deactivated {
|
||||
-fx-font-weight: bold;
|
||||
-fx-font-size: 16;
|
||||
-fx-text-fill: #999999;
|
||||
}
|
||||
|
||||
#wizard-title-active {
|
||||
-fx-font-weight: bold;
|
||||
-fx-font-size: 16;
|
||||
-fx-text-fill: #333333;
|
||||
}
|
||||
|
||||
#wizard-title-completed {
|
||||
-fx-font-weight: bold;
|
||||
-fx-font-size: 16;
|
||||
@ -349,9 +346,11 @@ textfield */
|
||||
#wizard-sub-title-deactivated {
|
||||
-fx-text-fill: #999999;
|
||||
}
|
||||
|
||||
#wizard-sub-title-active {
|
||||
-fx-text-fill: #333333;
|
||||
}
|
||||
|
||||
#wizard-sub-title-completed {
|
||||
-fx-text-fill: #333333;
|
||||
}
|
||||
@ -366,6 +365,7 @@ textfield */
|
||||
-fx-background-insets: 0 0 -1 0, 0, 1, 2;
|
||||
-fx-background-radius: 3px, 3px, 2px, 1px;
|
||||
}
|
||||
|
||||
#wizard-item-background-active {
|
||||
-fx-body-color: linear-gradient(to bottom, #f1f6f7, #e7f5f9);
|
||||
-fx-outer-border: linear-gradient(to bottom, #b5e1ef, #6aa4b6);
|
||||
@ -388,19 +388,19 @@ textfield */
|
||||
-fx-background-radius: 3px, 3px, 2px, 1px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Account settings */
|
||||
#wizard-title-disabled {
|
||||
-fx-font-weight: bold;
|
||||
-fx-font-size: 16;
|
||||
-fx-text-fill: #999999;
|
||||
}
|
||||
|
||||
#wizard-title-active {
|
||||
-fx-font-weight: bold;
|
||||
-fx-font-size: 16;
|
||||
-fx-text-fill: #333333;
|
||||
}
|
||||
|
||||
#wizard-title-selected {
|
||||
-fx-font-weight: bold;
|
||||
-fx-font-size: 16;
|
||||
@ -440,7 +440,6 @@ textfield */
|
||||
-fx-background-radius: 3px, 3px, 2px, 1px;
|
||||
}
|
||||
|
||||
|
||||
/* TitledGroupBg */
|
||||
#titled-group-bg-label {
|
||||
-fx-font-weight: bold;
|
||||
@ -448,12 +447,14 @@ textfield */
|
||||
-fx-text-fill: -bs-grey;
|
||||
-fx-background-color: #f4f4f4;
|
||||
}
|
||||
|
||||
#titled-group-bg-label-active {
|
||||
-fx-font-weight: bold;
|
||||
-fx-font-size: 14;
|
||||
-fx-text-fill: -fx-accent;
|
||||
-fx-background-color: #f4f4f4;
|
||||
}
|
||||
|
||||
#titled-group-bg {
|
||||
-fx-body-color: linear-gradient(to bottom, #f4f4f4, #F0F0F0);
|
||||
-fx-outer-border: linear-gradient(to bottom, #dddddd, #ccc);
|
||||
@ -464,6 +465,7 @@ textfield */
|
||||
-fx-background-insets: 0 0 -1 0, 0, 1, 2;
|
||||
-fx-background-radius: 3px, 3px, 2px, 1px;
|
||||
}
|
||||
|
||||
#titled-group-bg-active {
|
||||
-fx-body-color: linear-gradient(to bottom, #f4f4f4, #F0F0F0);
|
||||
-fx-outer-border: linear-gradient(to bottom, #9bbdc9, #57acc9);
|
||||
@ -475,11 +477,9 @@ textfield */
|
||||
-fx-background-radius: 3px, 3px, 2px, 1px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* TitledSeparator */
|
||||
#titled-separator:horizontal .line {
|
||||
-fx-border-color: transparent #f4f4f4 transparent #f4f4f4;
|
||||
-fx-background-color: transparent;
|
||||
-fx-border-width: 10px;
|
||||
-fx-border-color: transparent #f4f4f4 transparent #f4f4f4;
|
||||
-fx-background-color: transparent;
|
||||
-fx-border-width: 10px;
|
||||
}
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
#image-alert-round {
|
||||
-fx-image: url("../../../images/alert_round.png");
|
||||
}
|
||||
|
||||
#image-remove {
|
||||
-fx-image: url("../../../images/remove.png");
|
||||
}
|
||||
@ -44,12 +45,11 @@
|
||||
-fx-image: url("../../../images/sell_large.png");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* navigation buttons */
|
||||
#image-nav-home {
|
||||
-fx-image: url("../../../images/nav/home.png");
|
||||
}
|
||||
|
||||
#image-nav-home-active {
|
||||
-fx-image: url("../../../images/nav/home_active.png");
|
||||
}
|
||||
@ -57,6 +57,7 @@
|
||||
#image-nav-buy {
|
||||
-fx-image: url("../../../images/nav/buy.png");
|
||||
}
|
||||
|
||||
#image-nav-buy-active {
|
||||
-fx-image: url("../../../images/nav/buy_active.png");
|
||||
}
|
||||
@ -64,6 +65,7 @@
|
||||
#image-nav-sell {
|
||||
-fx-image: url("../../../images/nav/sell.png");
|
||||
}
|
||||
|
||||
#image-nav-sell-active {
|
||||
-fx-image: url("../../../images/nav/sell_active.png");
|
||||
}
|
||||
@ -71,6 +73,7 @@
|
||||
#image-nav-portfolio {
|
||||
-fx-image: url("../../../images/nav/portfolio.png");
|
||||
}
|
||||
|
||||
#image-nav-portfolio-active {
|
||||
-fx-image: url("../../../images/nav/portfolio_active.png");
|
||||
}
|
||||
@ -78,6 +81,7 @@
|
||||
#image-nav-funds {
|
||||
-fx-image: url("../../../images/nav/funds.png");
|
||||
}
|
||||
|
||||
#image-nav-funds-active {
|
||||
-fx-image: url("../../../images/nav/funds_active.png");
|
||||
}
|
||||
@ -85,6 +89,7 @@
|
||||
#image-nav-msg {
|
||||
-fx-image: url("../../../images/nav/msg.png");
|
||||
}
|
||||
|
||||
#image-nav-msg-active {
|
||||
-fx-image: url("../../../images/nav/msg_active.png");
|
||||
}
|
||||
@ -92,6 +97,7 @@
|
||||
#image-nav-settings {
|
||||
-fx-image: url("../../../images/nav/settings.png");
|
||||
}
|
||||
|
||||
#image-nav-settings-active {
|
||||
-fx-image: url("../../../images/nav/settings_active.png");
|
||||
}
|
||||
@ -99,11 +105,11 @@
|
||||
#image-nav-account {
|
||||
-fx-image: url("../../../images/nav/account.png");
|
||||
}
|
||||
|
||||
#image-nav-account-active {
|
||||
-fx-image: url("../../../images/nav/account_active.png");
|
||||
}
|
||||
|
||||
|
||||
/* account*/
|
||||
#image-tick {
|
||||
-fx-image: url("../../../images/tick.png");
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
text="The payments account data will be saved in a encrypted form to the Bitcoin block chain and will be used in the trade process for account verification."/>
|
||||
|
||||
<HBox fx:id="buttonsHBox" GridPane.columnIndex="1" GridPane.rowIndex="5" spacing="10">
|
||||
<Button fx:id="saveButton" text="Save" onAction="#onSave" defaultButton="true" disable="true"/>
|
||||
<Button fx:id="saveButton" text="Save" onAction="#onSave" defaultButton="true" disable="true"/>
|
||||
<GridPane.margin>
|
||||
<Insets top="15.0" bottom="5.0"/>
|
||||
</GridPane.margin>
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
<TitledGroupBg text="Complete the registration" GridPane.rowSpan="4"/>
|
||||
|
||||
<Label text="Registration costs:" GridPane.rowIndex="0">
|
||||
<GridPane.margin>
|
||||
<GridPane.margin>
|
||||
<Insets top="10.0"/>
|
||||
</GridPane.margin>
|
||||
</Label>
|
||||
|
||||
@ -31,7 +31,6 @@ import net.sourceforge.argparse4j.inf.Namespace;
|
||||
|
||||
public abstract class MessageModule extends BitsquareModule {
|
||||
|
||||
|
||||
private final Namespace argumentsNamespace;
|
||||
|
||||
protected MessageModule(Properties properties, Namespace argumentsNamespace) {
|
||||
@ -49,7 +48,7 @@ public abstract class MessageModule extends BitsquareModule {
|
||||
|
||||
Node bootstrapNode = BootstrapNodes.DIGITAL_OCEAN_1;
|
||||
// Passed program args will override the properties of the default bootstrapNode
|
||||
// So you can use the same id and ip but different ports (e.g. running several nodes on one server with
|
||||
// So you can use the same id and ip but different ports (e.g. running several nodes on one server with
|
||||
// different ports)
|
||||
if (argumentsNamespace.getString(ArgumentParser.SEED_ID_FLAG) != null)
|
||||
bootstrapNode.setId(argumentsNamespace.getString(ArgumentParser.SEED_ID_FLAG));
|
||||
|
||||
@ -87,7 +87,7 @@ public class CreateOfferCoordinator {
|
||||
}
|
||||
|
||||
try {
|
||||
offerRepository.addOffer(offer, () -> resultHandler.onResult(transaction), faultHandler);
|
||||
offerRepository.addOffer(offer, () -> resultHandler.onResult(transaction), faultHandler);
|
||||
} catch (Exception e) {
|
||||
faultHandler.handleFault("Offer fee payment failed.", e);
|
||||
}
|
||||
|
||||
@ -338,10 +338,10 @@ public class TomP2PNodeTest {
|
||||
FutureRemove futureRemove = node.removeFromDataMap(locationKey, data_1);
|
||||
futureRemove.awaitUninterruptibly();
|
||||
|
||||
// We don't test futureRemove.isSuccess() as this API does not fit well to that operation,
|
||||
// We don't test futureRemove.isSuccess() as this API does not fit well to that operation,
|
||||
// it might change in future to something like foundAndRemoved and notFound
|
||||
// See discussion at: https://github.com/tomp2p/TomP2P/issues/57#issuecomment-62069840
|
||||
|
||||
|
||||
|
||||
futureGet = node.getDataMap(locationKey);
|
||||
futureGet.awaitUninterruptibly();
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
/*
|
||||
* Copyright 2012 Thomas Bocek
|
||||
*
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
||||
* use this file except in compliance with the License. You may obtain a copy of
|
||||
* the License at
|
||||
*
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
@ -82,7 +82,7 @@ public class UtilsDHT2 {
|
||||
}
|
||||
|
||||
public static PeerAddress createAddress(Number160 idSender, String inetSender, int tcpPortSender,
|
||||
int udpPortSender, boolean firewallUDP,
|
||||
int udpPortSender, boolean firewallUDP,
|
||||
boolean firewallTCP) throws UnknownHostException {
|
||||
InetAddress inetSend = InetAddress.getByName(inetSender);
|
||||
PeerSocketAddress peerSocketAddress = new PeerSocketAddress(inetSend, tcpPortSender, udpPortSender);
|
||||
@ -92,9 +92,10 @@ public class UtilsDHT2 {
|
||||
}
|
||||
|
||||
public static Message createDummyMessage(Number160 idSender, String inetSender, int tcpPortSendor,
|
||||
int udpPortSender, Number160 idRecipien, String inetRecipient,
|
||||
int udpPortSender, Number160 idRecipien, String inetRecipient,
|
||||
int tcpPortRecipient,
|
||||
int udpPortRecipient, byte command, Type type, boolean firewallUDP, boolean firewallTCP)
|
||||
int udpPortRecipient, byte command, Type type, boolean firewallUDP,
|
||||
boolean firewallTCP)
|
||||
throws UnknownHostException {
|
||||
Message message = new Message();
|
||||
PeerAddress n1 = createAddress(idSender, inetSender, tcpPortSendor, udpPortSender, firewallUDP,
|
||||
@ -122,15 +123,11 @@ public class UtilsDHT2 {
|
||||
* Creates peers for testing. The first peer (peer[0]) will be used as the master. This means that shutting down
|
||||
* peer[0] will shut down all other peers
|
||||
*
|
||||
* @param nrOfPeers
|
||||
* The number of peers to create including the master
|
||||
* @param rnd
|
||||
* The random object to create random peer IDs
|
||||
* @param port
|
||||
* The port where the master peer will listen to
|
||||
* @param nrOfPeers The number of peers to create including the master
|
||||
* @param rnd The random object to create random peer IDs
|
||||
* @param port The port where the master peer will listen to
|
||||
* @return All the peers, with the master peer at position 0 -> peer[0]
|
||||
* @throws Exception
|
||||
* If the creation of nodes fail.
|
||||
* @throws Exception If the creation of nodes fail.
|
||||
*/
|
||||
public static PeerDHT[] createNodes(int nrOfPeers, Random rnd, int port, AutomaticFuture automaticFuture,
|
||||
boolean maintenance) throws Exception {
|
||||
@ -163,7 +160,8 @@ public class UtilsDHT2 {
|
||||
PeerMap peerMap = new PeerMap(new PeerMapConfiguration(peerId));
|
||||
Peer peer = new PeerBuilder(peerId)
|
||||
.masterPeer(master)
|
||||
.enableMaintenance(maintenance).enableMaintenance(maintenance).peerMap(peerMap).bindings(bindings).start().addAutomaticFuture(automaticFuture);
|
||||
.enableMaintenance(maintenance).enableMaintenance(maintenance).peerMap(peerMap).bindings
|
||||
(bindings).start().addAutomaticFuture(automaticFuture);
|
||||
peers[i] = new PeerBuilderDHT(peer).start();
|
||||
}
|
||||
else {
|
||||
@ -211,8 +209,7 @@ public class UtilsDHT2 {
|
||||
* Perfect routing, where each neighbor has contacted each other. This means that for small number of peers, every
|
||||
* peer knows every other peer.
|
||||
*
|
||||
* @param peers
|
||||
* The peers taking part in the p2p network.
|
||||
* @param peers The peers taking part in the p2p network.
|
||||
*/
|
||||
public static void perfectRouting(PeerDHT... peers) {
|
||||
for (int i = 0; i < peers.length; i++) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user