From 762e9893a73a371a138d2abbe49103e7dc1e5937 Mon Sep 17 00:00:00 2001 From: Stefan Suhren Date: Sat, 26 Aug 2017 13:26:35 +0200 Subject: Integrate thesis and defense into the normal grade list --- .../in/inf/se/notepadMinusMinus/model/Grades.java | 75 ---------------------- 1 file changed, 75 deletions(-) (limited to 'src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grades.java') 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 grades = FXCollections .observableArrayList(Grade.extractor()); - private ObjectProperty thesis = new SimpleObjectProperty<>( - new BigDecimal("0.0")); - - private ObjectProperty 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 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 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); - } - } -- cgit v1.2.3-70-g09d2