]> git.mxchange.org Git - jfinancials-core.git/blobdiff - src/org/mxchange/jfinancials/model/income/FinancialIncome.java
Updated copyright year
[jfinancials-core.git] / src / org / mxchange / jfinancials / model / income / FinancialIncome.java
index d29806cf213a342a615f34084307eb0f059dc40f..b01030bb942bce187b555103b9865770dc7e09ed 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 - 2020 Free Software Foundation
+ * Copyright (C) 2017 - 2024 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
-import org.mxchange.jcoreutils.Comparables;
+import org.mxchange.jcoreutils.comparable.ComparableUtils;
 import org.mxchange.jfinancials.model.income.interval.FinancialInterval;
 import org.mxchange.jusercore.model.user.LoginUser;
 import org.mxchange.jusercore.model.user.User;
@@ -198,7 +198,7 @@ public class FinancialIncome implements BillableIncome {
                };
 
                // Check all values
-               final int comparison = Comparables.checkAll(comparators);
+               final int comparison = ComparableUtils.checkAll(comparators);
 
                // Return value
                return comparison;
@@ -214,19 +214,19 @@ public class FinancialIncome implements BillableIncome {
                        return false;
                }
 
-               final BillableIncome other = (BillableIncome) object;
+               final BillableIncome income = (BillableIncome) object;
 
-               if (!Objects.equals(this.getIncomeEnabled(), other.getIncomeEnabled())) {
+               if (!Objects.equals(this.getIncomeEnabled(), income.getIncomeEnabled())) {
                        return false;
-               } else if (!Objects.equals(this.getIncomeId(), other.getIncomeId())) {
+               } else if (!Objects.equals(this.getIncomeId(), income.getIncomeId())) {
                        return false;
-               } else if (!Objects.equals(this.getIncomeInterval(), other.getIncomeInterval())) {
+               } else if (!Objects.equals(this.getIncomeInterval(), income.getIncomeInterval())) {
                        return false;
-               } else if (!Objects.equals(this.getIncomeSingleAmount(), other.getIncomeSingleAmount())) {
+               } else if (!Objects.equals(this.getIncomeSingleAmount(), income.getIncomeSingleAmount())) {
                        return false;
-               } else if (!Objects.equals(this.getIncomeTitle(), other.getIncomeTitle())) {
+               } else if (!Objects.equals(this.getIncomeTitle(), income.getIncomeTitle())) {
                        return false;
-               } else if (!Objects.equals(this.getIncomeUser(), other.getIncomeUser())) {
+               } else if (!Objects.equals(this.getIncomeUser(), income.getIncomeUser())) {
                        return false;
                }