summaryrefslogtreecommitdiffstats
path: root/src/de/fhswf/in/inf/se/notepadMinusMinus
diff options
context:
space:
mode:
authorStefan Suhren <suhren.stefan@fh-swf.de>2015-11-30 20:39:24 +0100
committerStefan Suhren <suhren.stefan@fh-swf.de>2015-11-30 20:39:24 +0100
commit0aecbe95f01e048b079eebc204746165da0574a4 (patch)
tree81d21f6ef3f3cb58e57e5cc57d07267dd77fc72d /src/de/fhswf/in/inf/se/notepadMinusMinus
parentfde59dfae9ccf9767193c7a8ce67ae27371f9638 (diff)
downloadNotepad---0aecbe95f01e048b079eebc204746165da0574a4.tar.gz
Notepad---0aecbe95f01e048b079eebc204746165da0574a4.zip
Return main Grades object
Diffstat (limited to 'src/de/fhswf/in/inf/se/notepadMinusMinus')
-rw-r--r--src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java6
-rw-r--r--src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
index eb22eb5..1123a85 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/Main.java
@@ -7,11 +7,9 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-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.ObservableList;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.scene.control.Alert;
@@ -79,9 +77,9 @@ public class Main extends Application
*
* @return
*/
- public ObservableList<Grade> getGradeList()
+ public Grades getGradesObject()
{
- return grades.gradesProperty();
+ return grades;
}
/**
diff --git a/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java b/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java
index b7bcddd..624e130 100644
--- a/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java
+++ b/src/de/fhswf/in/inf/se/notepadMinusMinus/view/MainViewController.java
@@ -123,7 +123,7 @@ public class MainViewController
public void setMain(Main main)
{
this.main = main;
- gradeTable.setItems(main.getGradeList());
+ gradeTable.setItems(main.getGradesObject().gradesProperty());
gradeTable.getItems().addListener((Change<? extends Grade> change) -> {
ectsSumLabel.setText("0");