From 1c1440fac8679f9ff94dcf20155ecc27ff42cf29 Mon Sep 17 00:00:00 2001
From: Kuba <jakubruszil@gmail.com>
Date: Mon, 22 May 2017 18:30:07 +0200
Subject: [PATCH] =?UTF-8?q?Agregacja=20sieci=20jeszcze=20bardziej=20sko?=
 =?UTF-8?q?=C5=84czona?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/netKnow/Code/NetworkAggregation.java | 7 +++----
 src/netKnow/Main.java                    | 5 ++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/netKnow/Code/NetworkAggregation.java b/src/netKnow/Code/NetworkAggregation.java
index f523d86..f8dfcf8 100644
--- a/src/netKnow/Code/NetworkAggregation.java
+++ b/src/netKnow/Code/NetworkAggregation.java
@@ -30,8 +30,8 @@ public IP[] aggregateNetwork() {
             int mask = j+1;
             String [] tmpString1 = {Integer.toString(tmp3[0]), Integer.toString(tmp3[1]), Integer.toString(tmp3[2]),
                     Integer.toString(tmp3[3]), Integer.toString(mask)};
-           result[k] = new IP(tmpString1);
-            while(j > 0) {
+            result[k] = new IP(tmpString1);
+            while((tmp3[j / 8] & (128 >> j%8)) == 0) {
                 tmp2[j / 8] |= 128 >> j % 8;
                 String[] tmpString = {Integer.toString(tmp2[0]), Integer.toString(tmp2[1]), Integer.toString(tmp2[2]),
                         Integer.toString(tmp2[3]), Integer.toString(j)};
@@ -41,8 +41,7 @@ public IP[] aggregateNetwork() {
                     i = key;
                     mask = j;
                 }
-                if(i < IPArray.length - 1)
-                    result[k].setMask(mask);
+                result[k].setMask(mask);
                 j--;
             }
             k++;
diff --git a/src/netKnow/Main.java b/src/netKnow/Main.java
index fef2579..017a14b 100644
--- a/src/netKnow/Main.java
+++ b/src/netKnow/Main.java
@@ -1,5 +1,6 @@
 package netKnow;
 
+import com.mysql.cj.core.conf.IntegerPropertyDefinition;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.layout.VBox;
@@ -14,6 +15,8 @@ public class Main extends Application {
 
     private Stage window;
 
+
+
     @Override
     public void start(Stage primaryStage) throws Exception{
         window = primaryStage;
@@ -23,7 +26,7 @@ public void start(Stage primaryStage) throws Exception{
         new LoginScene(scene);
         //new RoutingScene(scene);
         window.show();
-        //window.setFullScreen(true);*/
+        //window.setFullScreen(true);
     }