From 6d7a1bee0b6c3a31ec2ba4c262302349cab1c7c7 Mon Sep 17 00:00:00 2001 From: Stefan Suhren Date: Sun, 29 Nov 2015 20:18:39 +0100 Subject: Add extractor for gradeList --- src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java | 2 +- src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grade.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src/de/fhswf/in/inf') diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java index 444ea2b..e9e2af5 100644 --- a/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java +++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java @@ -23,7 +23,7 @@ import javafx.stage.Stage; public class Main extends Application { private ObservableList gradeList = FXCollections - .observableArrayList(); + .observableArrayList(Grade.extractor()); private Stage primaryStage; diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grade.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grade.java index 9c674d6..ad03065 100644 --- a/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grade.java +++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/model/Grade.java @@ -9,6 +9,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlValue; +import javafx.beans.Observable; import javafx.beans.property.IntegerProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleIntegerProperty; @@ -17,6 +18,7 @@ import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; +import javafx.util.Callback; /** * TODO Add comment here @@ -41,6 +43,13 @@ public class Grade private IntegerProperty attempt = new SimpleIntegerProperty(1); + public static Callback extractor() + { + return (Grade grade) -> new Observable[] { grade.semesterProperty(), + grade.modulenameProperty(), grade.ectsProperty(), + grade.gradeProperty(), grade.attemptProperty() }; + } + public final IntegerProperty semesterProperty() { return this.semester; -- cgit v1.2.3-70-g09d2