From 0458a6cdf28ce5c69aab284f2842b6add745d3b0 Mon Sep 17 00:00:00 2001 From: Orange_Dugongo Date: Mon, 31 Oct 2016 10:39:18 +0100 Subject: [PATCH] Fix --- src/Studenti-Esami/Segreteria.java | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/Studenti-Esami/Segreteria.java b/src/Studenti-Esami/Segreteria.java index 6ae1745..bc40052 100644 --- a/src/Studenti-Esami/Segreteria.java +++ b/src/Studenti-Esami/Segreteria.java @@ -40,26 +40,38 @@ public class Segreteria{ public Segreteria filtroMaggioreVoto(int voto){ ArrayList esami = new ArrayList(); + ArrayList studenti = new ArrayList(); for(Esame e: this.esami){ - if(e.getVoto()>=voto) + if(e.getVoto()>=voto){ esami.add(e); + for(Studente s: this.studenti) + if(e.getMatricola()==s.getMatricola()) + studenti.add(s); + } + } if(esami.size()==0) return null; - return new Segreteria(esami, this.studenti); + return new Segreteria(esami, studenti); } public Segreteria filtroMinoreVoto(int voto){ ArrayList esami = new ArrayList(); + ArrayList studenti = new ArrayList(); for(Esame e: this.esami){ - if(e.getVoto()