DMC/scipro
7
0
Fork 0
Code Issues35 Pull Requests5 Actions Projects1 Releases Wiki Activity

The handling of data in the filter string has been separated to its own method.

Browse Source
This commit is contained in:
Tom Vahlman 2012-04-02 16:25:13 +02:00
parent b7f52fc27d
commit 166e0d8500
1 changed files with 10 additions and 11 deletions

21
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);
}
}) {