Integrate thesis and defense into the normal grade list

1 files changed, 0 insertions, 75 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 18622cd..d5c4b6f 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grades.java
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grades.java
@@ -1,15 +1,10 @@
 package de.fhswf.in.inf.se.notepadMinusMinus.model;
 
-import java.math.BigDecimal;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.Property;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -25,12 +20,6 @@ public class Grades
    ObservableList<Grade> grades = FXCollections
          .observableArrayList(Grade.extractor());
 
-   private ObjectProperty<BigDecimal> thesis = new SimpleObjectProperty<>(
-         new BigDecimal("0.0"));
-
-   private ObjectProperty<BigDecimal> colloquium = new SimpleObjectProperty<>(
-         new BigDecimal("0.0"));
-
    /**
     * Get the {@link Grades} as a {@link List}.
     *
@@ -64,68 +53,4 @@ public class Grades
       return grades;
    }
 
-   /**
-    * Get the thesis grade {@link Property}.
-    *
-    * @return The {@link Property} grade of the thesis.
-    */
-   public final ObjectProperty<BigDecimal> thesisProperty()
-   {
-      return this.thesis;
-   }
-
-   /**
-    * Set the grade of the thesis.
-    *
-    * @return The grade of the thesis.
-    */
-   @XmlAttribute(name = "thesis")
-   public final BigDecimal getThesis()
-   {
-      return this.thesisProperty().get();
-   }
-
-   /**
-    * Set the grade of the thesis.
-    *
-    * @param thesis
-    *           The new grade of the thesis.
-    */
-   public final void setThesis(final BigDecimal thesis)
-   {
-      this.thesisProperty().set(thesis);
-   }
-
-   /**
-    * Get the colloquium grade {@link Property}.
-    *
-    * @return The colloquium grade {@link Property}.
-    */
-   public final ObjectProperty<BigDecimal> colloquiumProperty()
-   {
-      return this.colloquium;
-   }
-
-   /**
-    * Get the colloquium grade.
-    *
-    * @return The colloquium grade.
-    */
-   @XmlAttribute(name = "colloquium")
-   public final BigDecimal getColloquium()
-   {
-      return this.colloquiumProperty().get();
-   }
-
-   /**
-    * Set the colloquium grade.
-    *
-    * @param colloquium
-    *           The new colloquium grade.
-    */
-   public final void setColloquium(final BigDecimal colloquium)
-   {
-      this.colloquiumProperty().set(colloquium);
-   }
-
 }