From 0aecbe95f01e048b079eebc204746165da0574a4 Mon Sep 17 00:00:00 2001
From: Stefan Suhren <suhren.stefan@fh-swf.de>
Date: Mon, 30 Nov 2015 20:39:24 +0100
Subject: Return main Grades object

---
 src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java                  | 6 ++----
 .../fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java  | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/de/fhswf/in/inf/se/notepadMinusMinus')

diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
index eb22eb5..1123a85 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
@@ -7,11 +7,9 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
-import de.fhswf.in.inf.se.notepadMinusMinus.model.Grade;
 import de.fhswf.in.inf.se.notepadMinusMinus.model.Grades;
 import de.fhswf.in.inf.se.notepadMinusMinus.view.MainViewController;
 import javafx.application.Application;
-import javafx.collections.ObservableList;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
@@ -79,9 +77,9 @@ public class Main extends Application
     *
     * @return
     */
-   public ObservableList<Grade> getGradeList()
+   public Grades getGradesObject()
    {
-      return grades.gradesProperty();
+      return grades;
    }
 
    /**
diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java
index b7bcddd..624e130 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java
@@ -123,7 +123,7 @@ public class MainViewController
    public void setMain(Main main)
    {
       this.main = main;
-      gradeTable.setItems(main.getGradeList());
+      gradeTable.setItems(main.getGradesObject().gradesProperty());
 
       gradeTable.getItems().addListener((Change<? extends Grade> change) -> {
          ectsSumLabel.setText("0");
-- 
cgit v1.2.3-70-g09d2