From 166e0d850018c60c09a48a322b748badd5c3339e Mon Sep 17 00:00:00 2001 From: Tom Vahlman <tom@dsv.su.se> Date: Mon, 2 Apr 2012 16:25:13 +0200 Subject: [PATCH] The handling of data in the filter string has been separated to its own method. --- .../match/AdminSupervisorKeywordPanel.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java index 520ae25d8f..ef53e39d2a 100644 --- a/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java +++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java @@ -72,19 +72,15 @@ if(!supervisorName.toString().isEmpty()) { } private List<Employee> addEmployeesToList(final StringBuffer supervisorName, List<Employee> employeeList) { - if(supervisorName.toString().isEmpty()) { - return employeeList; - } else { - List<Employee> employeeListName = new ArrayList<Employee>(); - for(Employee employee : employeeList) { - if(employee.getNameAsString().equals(supervisorName.toString())) { - employeeListName.add(employee); - } - } - if(!employeeListName.isEmpty()) { - return employeeListName; + List<Employee> employeeListName = new ArrayList<Employee>(); + for(Employee employee : employeeList) { + if(employee.getNameAsString().equals(supervisorName.toString())) { + employeeListName.add(employee); } } + if(!employeeListName.isEmpty()) { + return employeeListName; + } return employeeList; } @@ -107,6 +103,9 @@ if(!supervisorName.toString().isEmpty()) { } List<Employee> employeeList = new ArrayList<Employee>(); employeeList.addAll(supervisorService.findAllEmployees(sorter)); + if(supervisorName.toString().isEmpty()) { + return employeeList; + } return addEmployeesToList(supervisorName, employeeList); } }) {