Put gradeList into grades

1 files changed, 4 insertions, 11 deletions

diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
index 3a72d6b..eb22eb5 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
@@ -11,7 +11,6 @@ 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.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
@@ -28,8 +27,7 @@ import javafx.stage.Stage;
  */
 public class Main extends Application
 {
-   private ObservableList<Grade> gradeList = FXCollections
-         .observableArrayList(Grade.extractor());
+   private Grades grades = new Grades();
 
    private Stage primaryStage;
 
@@ -83,7 +81,7 @@ public class Main extends Application
     */
    public ObservableList<Grade> getGradeList()
    {
-      return gradeList;
+      return grades.gradesProperty();
    }
 
    /**
@@ -174,8 +172,7 @@ public class Main extends Application
          // Reading XML from the file and unmarshalling.
          Grades wrapper = (Grades) um.unmarshal(file);
 
-         gradeList.clear();
-         gradeList.addAll(wrapper.getGrades());
+         grades.setGrades(wrapper.getGrades());
 
          // Save the file path to the registry.
          setGradesFilePath(file);
@@ -210,12 +207,8 @@ public class Main extends Application
          Marshaller m = context.createMarshaller();
          m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
 
-         // Wrapping our grades data.
-         Grades wrapper = new Grades();
-         wrapper.setGrades(gradeList);
-
          // Marshalling and saving XML to the file.
-         m.marshal(wrapper, file);
+         m.marshal(grades, file);
 
          // Save the file path to the registry.
          setGradesFilePath(file);