From d329a69c999f07ab5082b0a2b6aca6d6f452e6f3 Mon Sep 17 00:00:00 2001 From: Dina-Marie Hanxleden Date: Tue, 12 Jan 2016 19:34:16 +0100 Subject: Change student list to properties as the maximum is always known --- .../view/ProjektHinzufuegenController.java | 26 ++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'src/de/fhswf/in/inf/se/projektthemenvergabe/view/ProjektHinzufuegenController.java') 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) -- cgit v1.2.3-70-g09d2