MK13/financer
1
0
Fork 0
Code Issues 10 Actions Activity

Rename class

Browse Source
This commit is contained in:
MK13
2020-01-21 16:52:37 +01:00
parent 99368c1f0e
commit fe94a2781f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
financer-web-client/src/main/java/de/financer/util/ControllerUtils.java
View File

@@ -6,12 +6,11 @@ import de.financer.model.Account;
import de.financer.model.AccountGroup; import de.financer.model.AccountGroup;
import de.financer.model.AccountStatus; import de.financer.model.AccountStatus;
import de.financer.model.RecurringTransaction; import de.financer.model.RecurringTransaction;
import de.financer.util.comparator.AccountByTypeByIdComparator; import de.financer.util.comparator.AccountByTypeByGroupNameByIdComparator;
import org.apache.commons.collections4.IterableUtils; import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import java.text.DateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle; import java.time.format.FormatStyle;
@@ -33,7 +32,7 @@ public class ControllerUtils {
return IterableUtils.toList(accounts).stream() return IterableUtils.toList(accounts).stream()
.filter((acc) -> AccountStatus.OPEN .filter((acc) -> AccountStatus.OPEN
.equals(acc.getStatus()) || showClosed) .equals(acc.getStatus()) || showClosed)
.sorted(new AccountByTypeByIdComparator()) .sorted(new AccountByTypeByGroupNameByIdComparator())
.collect(Collectors.toList()); .collect(Collectors.toList());
} }

2
financer-web-client/src/main/java/de/financer/util/comparator/AccountByTypeByIdComparator.java → financer-web-client/src/main/java/de/financer/util/comparator/AccountByTypeByGroupNameByIdComparator.java
View File

@@ -6,7 +6,7 @@ import de.financer.model.AccountType;
import java.util.Comparator; import java.util.Comparator;
import java.util.Map; import java.util.Map;
public class AccountByTypeByIdComparator implements Comparator<Account> { public class AccountByTypeByGroupNameByIdComparator implements Comparator<Account> {
//@formatter:off //@formatter:off
private static final Map<AccountType, Integer> SORT_ORDER = Map.of(AccountType.BANK, 1, private static final Map<AccountType, Integer> SORT_ORDER = Map.of(AccountType.BANK, 1,
AccountType.CASH, 2, AccountType.CASH, 2,