From b59d0596000590555ead28e365663f7dfdcb47a2 Mon Sep 17 00:00:00 2001 From: mq007 Date: Wed, 24 May 2017 23:21:46 +0200 Subject: [PATCH 1/3] Added errorLabel in aggregation --- src/netKnow/Class/IP.java | 1 + .../controller/AggregationController.java | 26 ++++++++++++------- src/netKnow/fxml/network_aggregation.fxml | 6 +++-- src/netKnow/scene/SingleIP.java | 2 ++ 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/netKnow/Class/IP.java b/src/netKnow/Class/IP.java index 72320f1..83984af 100644 --- a/src/netKnow/Class/IP.java +++ b/src/netKnow/Class/IP.java @@ -19,6 +19,7 @@ public IP(String [] fullIPAdress){ convertStringToMask(); } + private void convertStringToIPAdress(String [] fullIPAdress){ for(int i = 0; i < 4; i++) { ipArray[i] = Integer.parseInt(fullIPAdress[i]); diff --git a/src/netKnow/controller/AggregationController.java b/src/netKnow/controller/AggregationController.java index 5170e6b..11bf5c4 100644 --- a/src/netKnow/controller/AggregationController.java +++ b/src/netKnow/controller/AggregationController.java @@ -1,6 +1,7 @@ package netKnow.controller; import javafx.fxml.FXML; +import javafx.geometry.Pos; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.Label; @@ -9,6 +10,7 @@ import javafx.scene.input.KeyCode; import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; +import javafx.scene.paint.Color; import netKnow.Class.IP; import netKnow.Code.NetworkAggregation; import netKnow.scene.AggregationPopUp; @@ -26,13 +28,13 @@ public class AggregationController { @FXML private Button okButton; @FXML - private ScrollPane networkScrollPane; - @FXML private VBox networkListVbox; @FXML private Button backButton; @FXML private Button aggregateButton; + @FXML + private Label errorLabel; List arrayListSingleIp; int amount=0; @@ -41,7 +43,7 @@ public class AggregationController { public IP[] aggregatedNetwork; @FXML - void initialize(){ + void initialize(){ amountNetwork.setOnKeyPressed(event -> { if(event.getCode() == KeyCode.ENTER ){ okButton.fire(); @@ -50,15 +52,19 @@ void initialize(){ okButton.setOnAction(event -> { amount = Integer.parseInt(amountNetwork.getText()); - networkListVbox.getChildren().clear(); - arrayListSingleIp = new ArrayList(); - for (int i=0; i 10){ + errorLabel.setText("Liczba sieci do agregacji nie może być > 10"); + }else if(amount < 1){ + errorLabel.setText("Liczba nie może być <= 0"); + }else{ + arrayListSingleIp = new ArrayList<>(); + for (int i=0; i { diff --git a/src/netKnow/fxml/network_aggregation.fxml b/src/netKnow/fxml/network_aggregation.fxml index 21b8a93..2538644 100644 --- a/src/netKnow/fxml/network_aggregation.fxml +++ b/src/netKnow/fxml/network_aggregation.fxml @@ -10,7 +10,7 @@ - + @@ -43,6 +43,7 @@ + @@ -54,11 +55,12 @@ - +