Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-26 08:25:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Polish whitespace

Browse source 
Run "Reformat code" and "Optimize Imports" from within IDEA, cleaning up
trailing whitespace and other issues.
This commit is contained in:
Chris Beams 2014-11-09 22:13:17 +01:00
parent dfbe6973e7
commit 017ebb3f38
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
9 changed files with 72 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/io/bitsquare/app/AppModule.java
View file

@ -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) {

30
src/main/java/io/bitsquare/gui/bitsquare.css
View file

@ -32,11 +32,11 @@ lower gradient color on tab: dddddd
-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;
@ -81,11 +80,13 @@ lower gradient color on tab: dddddd
-fx-alignment: center;
-fx-background-color: #dddddd;
}
#nav-alert-label {
-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 *
@ -133,7 +133,6 @@ lower gradient color on tab: dddddd
-fx-font-size: 0.85em;
}
/* Same style like non editable textfield. But textfield spans a whole column in a grid, so we use generally
textfield */
#label-with-background {
@ -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,12 +275,10 @@ textfield */
-fx-text-fill: red;
}
/* Account */
#content-pane-top {
-fx-background-color:
#cfcfcf,
-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;
@ -328,18 +324,19 @@ textfield */
-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,8 +477,6 @@ textfield */
-fx-background-radius: 3px, 3px, 2px, 1px;
}
/* TitledSeparator */
#titled-separator:horizontal .line {
-fx-border-color: transparent #f4f4f4 transparent #f4f4f4;

12
src/main/java/io/bitsquare/gui/images.css
View file

@ -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");

1
src/main/java/io/bitsquare/msg/MessageModule.java
View file

@ -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) {

21
src/test/java/net/tomp2p/dht/UtilsDHT2.java
View file

@ -94,7 +94,8 @@ public class UtilsDHT2 {
public static Message createDummyMessage(Number160 idSender, String inetSender, int tcpPortSendor,
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++) {