Match seed nodes ports with network id, improve logs

This commit is contained in:
Manfred Karrer 2015-11-10 17:29:41 +01:00
parent 5618f23654
commit 6b89f19927
30 changed files with 259 additions and 173 deletions

View file

@ -74,7 +74,7 @@
</GridPane.margin>
</TextField>
<Label text="Authenticated peers:" GridPane.rowIndex="4"/>
<Label fx:id="authenticatedPeersLabel" text="Authenticated peers:" GridPane.rowIndex="4"/>
<TextArea fx:id="authenticatedPeersTextArea" GridPane.rowIndex="4" GridPane.columnIndex="1"
mouseTransparent="true" focusTraversable="false"/>

View file

@ -35,7 +35,9 @@ import io.bitsquare.user.Preferences;
import javafx.beans.value.ChangeListener;
import javafx.collections.FXCollections;
import javafx.fxml.FXML;
import javafx.geometry.Insets;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.TextArea;
import javafx.scene.control.TextField;
import javafx.scene.layout.GridPane;
@ -53,12 +55,16 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
private final Preferences preferences;
private final P2PService p2PService;
@FXML
TextField bitcoinNetwork, onionAddress, connectedPeersBTC;
@FXML
ComboBox<BitcoinNetwork> netWorkComboBox;
@FXML
TextArea authenticatedPeersTextArea;
@FXML
Label authenticatedPeersLabel;
private P2PServiceListener p2PServiceListener;
private ChangeListener<Number> numAuthenticatedPeersChangeListener;
private Set<Address> seedNodeAddresses;
@ -77,6 +83,7 @@ public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activ
}
public void initialize() {
GridPane.setMargin(authenticatedPeersLabel, new Insets(4, 0, 0, 0));
bitcoinNetwork.setText(bitcoinNetworkString);
connectedPeersBTC.textProperty().bind(createStringBinding(() -> String.valueOf(walletService.numPeersProperty().get()), walletService
.numPeersProperty()));

View file

@ -164,7 +164,7 @@ public class FormBuilder {
public static Tuple2<Label, TextArea> addLabelTextArea(GridPane gridPane, int rowIndex, String title, String prompt, double top) {
Label label = addLabel(gridPane, rowIndex, title, 0);
GridPane.setMargin(label, new Insets(top, 0, 0, 0));
GridPane.setMargin(label, new Insets(top + 4, 0, 0, 0));
GridPane.setValignment(label, VPos.TOP);
TextArea textArea = new TextArea();