Seperated the lineChart into a separate class

src/main/java/com/application/DB/Constants.java

@@ -71,8 +71,8 @@ public final class Constants {
     public static final String START_DRYING_NAME = "DryingStarted";
     public static final String STOP_DRYING_NAME = "DryingCompleted";
     public static final String KILIN_NAME = "KilinId";
-    public static int KILIN_ID = 18;
-    //public static int KILIN_ID = 18554;
+    //public static int KILIN_ID = 18;
+    public static int KILIN_ID = 18554;
 
     // Swappconsensordata
     public static final String KWH_NAME = "RealValue";

src/main/java/com/application/GUI/Input.java → src/main/java/com/application/GUI/InputPopUpWindow.java

@@ -15,7 +15,7 @@ import com.application.Main;
  * @author Eilert Tunheim, Karin Pettersen, Mads Arnesen
  * @version 1.0
  */
-public class Input {
+public class InputPopUpWindow {
 
     public static void display()
     {
@@ -79,7 +79,7 @@ public class Input {
 
             // Call på getKwh()
             try {
-                Main.createLineChart();
+                //Main.createLineChart();
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
@@ -92,7 +92,7 @@ public class Input {
         layout.setAlignment(Pos.CENTER);
 
         Scene scene = new Scene(layout, 600, 600);
-        scene.getStylesheets().add(Input.class.getResource("/com.application/CSS/styleSheet.css").toExternalForm());
+        scene.getStylesheets().add(InputPopUpWindow.class.getResource("/com.application/CSS/styleSheet.css").toExternalForm());
         window.setScene(scene);
         window.showAndWait();
     }

src/main/java/com/application/GUI/LineChartFunctionality.java

+package com.application.GUI;
+
+import javafx.scene.chart.CategoryAxis;
+import javafx.scene.chart.LineChart;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.chart.XYChart;
+
+public class LineChartFunctionality {
+
+    LineChart<String, Number> lineChart;
+    XYChart.Series<String, Number> series;
+    CategoryAxis xAxis;
+    NumberAxis yAxis;
+
+
+    public LineChartFunctionality(){
+        xAxis = new CategoryAxis();
+        yAxis = new NumberAxis();
+        series = new XYChart.Series<String, Number>();
+        lineChart = new LineChart<>(xAxis,yAxis);
+        lineChart.getData().add(series);
+        xAxis.setLabel("Date");
+        yAxis.setLabel("Kwh");
+        lineChart.setTitle("Drying Processes");
+    }
+
+    public LineChart<String, Number> getLineChart() {
+        return lineChart;
+    }
+
+    public void setLineChart(LineChart<String, Number> lineChart) {
+        this.lineChart = lineChart;
+    }
+
+    public XYChart.Series<String, Number> getSeries() {
+        return series;
+    }
+
+    public void setSeries(XYChart.Series<String, Number> series) {
+        this.series = series;
+    }
+
+}

src/main/java/com/application/Main.java

 package com.application;
 
-import com.application.DB.DB;
-import com.application.GUI.Input;
+import com.application.GUI.InputPopUpWindow;
 import com.application.GUI.RingProgressIndicator;
+import com.application.GUI.LineChartFunctionality;
 
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -13,14 +13,10 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.*;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import javafx.scene.chart.CategoryAxis;
-import javafx.scene.chart.NumberAxis;
-import javafx.scene.chart.XYChart;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.*;
 import java.util.logging.Logger;
 
 import static java.util.logging.Level.SEVERE;
@@ -37,6 +33,7 @@ public class Main extends Application {
     private HBox logoBar;
     private VBox sideBar;
     private MenuBar menuBar;
+    private LineChartFunctionality lineChartFunctionality;
 
     /**
      * Starts the application
@@ -62,6 +59,7 @@ public class Main extends Application {
         this.logoBar = new HBox();
         this.sideBar = new VBox();
         this.menuBar = new MenuBar();
+        this.lineChartFunctionality = new LineChartFunctionality();
     }
 
     /**
@@ -78,7 +76,8 @@ public class Main extends Application {
         this.menuBar = createMenuBar();
         this.sideBar = createSideBar();
         this.logoBar = createLogoBar();
-        LineChart<String, Number> lineChart = createLineChart();
+
+        LineChart<String, Number> lineChart = this.lineChartFunctionality.getLineChart();
 
         //Set id's to connect to css stylesheet
         root.setId("root");
@@ -174,7 +173,7 @@ public class Main extends Application {
 
         Button finish = new Button("Finish");
         finish.setId("sideBarButtonFinish");
-        finish.setOnAction(e -> Input.display());
+        finish.setOnAction(e -> InputPopUpWindow.display());
 
 
         // Creating the circular progressbar
@@ -261,16 +260,9 @@ public class Main extends Application {
     }
 
 
-    public static LineChart<String,Number> createLineChart() throws Exception {
-
-        final CategoryAxis xAxis = new CategoryAxis();
-        final NumberAxis yAxis = new NumberAxis();
-        xAxis.setLabel("Date");
-
-        final LineChart<String, Number> lineChart = new LineChart<>(xAxis, yAxis);
 
-        lineChart.setTitle("Drying Processes");
 
+        /*
         Map<Integer, Map> kWh = DB.getKwh();
 
 
@@ -293,13 +285,13 @@ public class Main extends Application {
             lineChart.getData().add(series);
             //System.out.println("\n\nNew line\n\n");
         }
+
+         */
 /*
         for (Map.Entry<Integer, Map> entryKwh : kWh.entrySet()) {
             System.out.printf("Index: \t%s\t\t\tkWh: \t%s\n",entryKwh.getKey(),entryKwh.getValue());
         }
  */
-        return lineChart;
-    }
 }