Put gradeList into grades

1 files changed, 18 insertions, 9 deletions

diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grades.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grades.java
index 631097e..aafc1e6 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grades.java
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grades.java
@@ -1,7 +1,6 @@
 package de.fhswf.in.inf.se.notepadMinusMinus.model;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlAttribute;
@@ -10,6 +9,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 
 /**
  * TODO Add comment here
@@ -20,7 +21,8 @@ import javafx.beans.property.SimpleObjectProperty;
 @XmlRootElement(name = "grades")
 public class Grades
 {
-   protected List<Grade> grades;
+   ObservableList<Grade> grades = FXCollections
+         .observableArrayList(Grade.extractor());
 
    private ObjectProperty<BigDecimal> thesis = new SimpleObjectProperty<>(
          new BigDecimal("0.0"));
@@ -36,21 +38,28 @@ public class Grades
    @XmlElement(name = "grade", required = true)
    public List<Grade> getGrades()
    {
-      if (grades == null)
-      {
-         grades = new ArrayList<>();
-      }
       return this.grades;
    }
 
    /**
     * TODO Add method comment here
     *
-    * @param consumption
+    * @param grades
     */
-   public void setGrades(List<Grade> consumption)
+   public void setGrades(List<Grade> grades)
    {
-      this.grades = consumption;
+      this.grades.clear();
+      this.grades.setAll(grades);
+   }
+
+   /**
+    * TODO Add method comment here
+    *
+    * @return
+    */
+   public ObservableList<Grade> gradesProperty()
+   {
+      return grades;
    }
 
    /**