Change student list to properties as the maximum is always known

2 files changed, 34 insertions, 39 deletions

diff --git a/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegenController.java b/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegenController.java
index deb2293..65fa98c 100644
--- a/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegenController.java
+++ b/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegenController.java
@@ -130,17 +130,17 @@ public class ProjektHinzufuegenController
 
          ansprechpartnerComboBox.setValue(projekt.getAnsprechpartner());
 
-         if (projekt.getStudents().size() > 0)
+         if (projekt.getStudent1() != null)
          {
-            student1ComboBox.setValue(projekt.getStudents().get(0));
+            student1ComboBox.setValue(projekt.getStudent1());
          }
-         if (projekt.getStudents().size() > 1)
+         if (projekt.getStudent2() != null)
          {
-            student2ComboBox.setValue(projekt.getStudents().get(1));
+            student2ComboBox.setValue(projekt.getStudent2());
          }
-         if (projekt.getStudents().size() > 2)
+         if (projekt.getStudent3() != null)
          {
-            student3ComboBox.setValue(projekt.getStudents().get(2));
+            student3ComboBox.setValue(projekt.getStudent3());
          }
 
          dozentenkommentar.setText(projekt.getDozentenkommentar());
@@ -224,10 +224,18 @@ public class ProjektHinzufuegenController
          {
             projekt.setProjektthema(projektthemaTextField.getText().trim());
             projekt.setAnsprechpartner(ansprechpartnerComboBox.getValue());
-            for (Student student : projekt.getStudents()
-                  .toArray(new Student[projekt.getStudents().size()]))
+
+            if (projekt.getStudent1() != null)
+            {
+               projekt.removeStudent(projekt.getStudent1());
+            }
+            if (projekt.getStudent2() != null)
+            {
+               projekt.removeStudent(projekt.getStudent2());
+            }
+            if (projekt.getStudent3() != null)
             {
-               projekt.removeStudent(student);
+               projekt.removeStudent(projekt.getStudent3());
             }
 
             if (student1ComboBox.getValue() != null)
diff --git a/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektthemenverwaltungsController.java b/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektthemenverwaltungsController.java
index ffea351..2cd1c14 100644
--- a/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektthemenverwaltungsController.java
+++ b/src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektthemenverwaltungsController.java
@@ -7,6 +7,7 @@ import de.fhswf.in.inf.se.projektthemenvergabe.model.Projekt;
 import de.fhswf.in.inf.se.projektthemenvergabe.model.Student;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.transformation.FilteredList;
 import javafx.collections.transformation.SortedList;
@@ -35,13 +36,13 @@ public class ProjektthemenverwaltungsController
    private TableColumn<Projekt, String> ansprechpatnerTableColumn;
 
    @FXML
-   private TableColumn<Projekt, Integer> student1TableColumn;
+   private TableColumn<Projekt, Student> student1TableColumn;
 
    @FXML
-   private TableColumn<Projekt, Integer> student2TableColumn;
+   private TableColumn<Projekt, Student> student2TableColumn;
 
    @FXML
-   private TableColumn<Projekt, Integer> student3TableColumn;
+   private TableColumn<Projekt, Student> student3TableColumn;
 
    @FXML
    private TableColumn<Projekt, Projekt.StatusTypes> statusTableColumn;
@@ -73,30 +74,9 @@ public class ProjektthemenverwaltungsController
             (data) -> data.getValue().projektthemaProperty());
       ansprechpatnerTableColumn.setCellValueFactory(
             (data) -> data.getValue().getAnsprechpartner().nameProperty());
-      student1TableColumn.setCellValueFactory((data) -> {
-         if (data.getValue().getStudents().size() > 0)
-         {
-            return data.getValue().getStudents().get(0)
-                  .matrikelnummerProperty().asObject();
-         }
-         return new SimpleIntegerProperty(0).asObject();
-      });
-      student2TableColumn.setCellValueFactory((data) -> {
-         if (data.getValue().getStudents().size() > 1)
-         {
-            return data.getValue().getStudents().get(1)
-                  .matrikelnummerProperty().asObject();
-         }
-         return new SimpleIntegerProperty(0).asObject();
-      });
-      student3TableColumn.setCellValueFactory((data) -> {
-         if (data.getValue().getStudents().size() > 2)
-         {
-            return data.getValue().getStudents().get(2)
-                  .matrikelnummerProperty().asObject();
-         }
-         return new SimpleIntegerProperty(0).asObject();
-      });
+      student1TableColumn.setCellValueFactory((data) -> data.getValue().student1Property());
+      student2TableColumn.setCellValueFactory((data) -> data.getValue().student2Property());
+      student3TableColumn.setCellValueFactory((data) -> data.getValue().student3Property());
       statusTableColumn
             .setCellValueFactory((data) -> data.getValue().statusProperty());
       statusTableColumn.setCellFactory(ComboBoxTableCell.forTableColumn(
@@ -309,10 +289,17 @@ public class ProjektthemenverwaltungsController
 
       if (selectedItem != null)
       {
-         for (Student student : selectedItem.getStudents()
-               .toArray(new Student[selectedItem.getStudents().size()]))
+         if (selectedItem.getStudent1() != null)
+         {
+            selectedItem.getStudent1().setProjekt(null);
+         }
+         if (selectedItem.getStudent2() != null)
+         {
+            selectedItem.getStudent2().setProjekt(null);
+         }
+         if (selectedItem.getStudent3() != null)
          {
-            student.setProjekt(null);
+            selectedItem.getStudent3().setProjekt(null);
          }
 
          main.getProjekte().remove(selectedItem);