diff options
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/model/widget')
8 files changed, 39 insertions, 26 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidget.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidget.java index d6e7d4b08..d336bced6 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidget.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidget.java @@ -8,6 +8,7 @@ import androidx.room.PrimaryKey; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import it.niedermann.nextcloud.deck.model.enums.EDueType; @@ -113,7 +114,7 @@ public class FilterWidget { FilterWidget that = (FilterWidget) o; if (id != that.id) return false; - if (title != null ? !title.equals(that.title) : that.title != null) return false; + if (!Objects.equals(title, that.title)) return false; if (dueType != that.dueType) return false; if (widgetType != that.widgetType) return false; if (!accounts.equals(that.accounts)) return false; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetAccount.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetAccount.java index caf4e5dd1..971e26920 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetAccount.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetAccount.java @@ -9,6 +9,7 @@ import androidx.room.PrimaryKey; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; import it.niedermann.nextcloud.deck.model.Account; @@ -136,14 +137,14 @@ public class FilterWidgetAccount { if (includeNoUser != that.includeNoUser) return false; if (includeNoProject != that.includeNoProject) return false; - if (id != null ? !id.equals(that.id) : that.id != null) return false; - if (filterWidgetId != null ? !filterWidgetId.equals(that.filterWidgetId) : that.filterWidgetId != null) + if (!Objects.equals(id, that.id)) return false; + if (!Objects.equals(filterWidgetId, that.filterWidgetId)) return false; - if (accountId != null ? !accountId.equals(that.accountId) : that.accountId != null) + if (!Objects.equals(accountId, that.accountId)) return false; - if (boards != null ? !boards.equals(that.boards) : that.boards != null) return false; - if (users != null ? !users.equals(that.users) : that.users != null) return false; - return projects != null ? projects.equals(that.projects) : that.projects == null; + if (!Objects.equals(boards, that.boards)) return false; + if (!Objects.equals(users, that.users)) return false; + return Objects.equals(projects, that.projects); } @Override diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetBoard.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetBoard.java index b1697f9b7..95fff94c4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetBoard.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetBoard.java @@ -8,6 +8,7 @@ import androidx.room.PrimaryKey; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import it.niedermann.nextcloud.deck.model.Board; @@ -109,12 +110,12 @@ public class FilterWidgetBoard { FilterWidgetBoard that = (FilterWidgetBoard) o; if (includeNoLabel != that.includeNoLabel) return false; - if (id != null ? !id.equals(that.id) : that.id != null) return false; - if (filterAccountId != null ? !filterAccountId.equals(that.filterAccountId) : that.filterAccountId != null) + if (!Objects.equals(id, that.id)) return false; + if (!Objects.equals(filterAccountId, that.filterAccountId)) return false; - if (boardId != null ? !boardId.equals(that.boardId) : that.boardId != null) return false; - if (stacks != null ? !stacks.equals(that.stacks) : that.stacks != null) return false; - return labels != null ? labels.equals(that.labels) : that.labels == null; + if (!Objects.equals(boardId, that.boardId)) return false; + if (!Objects.equals(stacks, that.stacks)) return false; + return Objects.equals(labels, that.labels); } @Override diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetLabel.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetLabel.java index 0df280c98..e2811a48e 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetLabel.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetLabel.java @@ -5,6 +5,8 @@ import androidx.room.ForeignKey; import androidx.room.Index; import androidx.room.PrimaryKey; +import java.util.Objects; + import it.niedermann.nextcloud.deck.model.Label; @Entity( @@ -63,10 +65,10 @@ public class FilterWidgetLabel { FilterWidgetLabel that = (FilterWidgetLabel) o; - if (id != null ? !id.equals(that.id) : that.id != null) return false; - if (filterBoardId != null ? !filterBoardId.equals(that.filterBoardId) : that.filterBoardId != null) + if (!Objects.equals(id, that.id)) return false; + if (!Objects.equals(filterBoardId, that.filterBoardId)) return false; - return labelId != null ? labelId.equals(that.labelId) : that.labelId == null; + return Objects.equals(labelId, that.labelId); } @Override diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetProject.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetProject.java index 7ed3f956c..d1e0456ea 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetProject.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetProject.java @@ -6,6 +6,8 @@ import androidx.room.Ignore; import androidx.room.Index; import androidx.room.PrimaryKey; +import java.util.Objects; + import it.niedermann.nextcloud.deck.model.ocs.projects.OcsProject; @Entity( @@ -73,10 +75,10 @@ public class FilterWidgetProject { FilterWidgetProject that = (FilterWidgetProject) o; - if (id != null ? !id.equals(that.id) : that.id != null) return false; - if (filterAccountId != null ? !filterAccountId.equals(that.filterAccountId) : that.filterAccountId != null) + if (!Objects.equals(id, that.id)) return false; + if (!Objects.equals(filterAccountId, that.filterAccountId)) return false; - return projectId != null ? projectId.equals(that.projectId) : that.projectId == null; + return Objects.equals(projectId, that.projectId); } @Override diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java index ae6516c94..26ab9eab3 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java @@ -7,6 +7,8 @@ import androidx.room.Ignore; import androidx.room.Index; import androidx.room.PrimaryKey; +import java.util.Objects; + import it.niedermann.nextcloud.deck.model.enums.ESortCriteria; @Entity( @@ -108,8 +110,8 @@ public class FilterWidgetSort { if (direction != that.direction) return false; if (ruleOrder != that.ruleOrder) return false; - if (id != null ? !id.equals(that.id) : that.id != null) return false; - if (filterWidgetId != null ? !filterWidgetId.equals(that.filterWidgetId) : that.filterWidgetId != null) + if (!Objects.equals(id, that.id)) return false; + if (!Objects.equals(filterWidgetId, that.filterWidgetId)) return false; return criteria == that.criteria; } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetStack.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetStack.java index 2da1c0b79..00f9cce49 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetStack.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetStack.java @@ -6,6 +6,8 @@ import androidx.room.Ignore; import androidx.room.Index; import androidx.room.PrimaryKey; +import java.util.Objects; + import it.niedermann.nextcloud.deck.model.Stack; @Entity( @@ -73,10 +75,10 @@ public class FilterWidgetStack { FilterWidgetStack that = (FilterWidgetStack) o; - if (id != null ? !id.equals(that.id) : that.id != null) return false; - if (filterBoardId != null ? !filterBoardId.equals(that.filterBoardId) : that.filterBoardId != null) + if (!Objects.equals(id, that.id)) return false; + if (!Objects.equals(filterBoardId, that.filterBoardId)) return false; - return stackId != null ? stackId.equals(that.stackId) : that.stackId == null; + return Objects.equals(stackId, that.stackId); } @Override diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetUser.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetUser.java index 9fd69aa85..304284239 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetUser.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetUser.java @@ -6,6 +6,8 @@ import androidx.room.Ignore; import androidx.room.Index; import androidx.room.PrimaryKey; +import java.util.Objects; + import it.niedermann.nextcloud.deck.model.User; @Entity( @@ -73,10 +75,10 @@ public class FilterWidgetUser { FilterWidgetUser that = (FilterWidgetUser) o; - if (id != null ? !id.equals(that.id) : that.id != null) return false; - if (filterAccountId != null ? !filterAccountId.equals(that.filterAccountId) : that.filterAccountId != null) + if (!Objects.equals(id, that.id)) return false; + if (!Objects.equals(filterAccountId, that.filterAccountId)) return false; - return userId != null ? userId.equals(that.userId) : that.userId == null; + return Objects.equals(userId, that.userId); } @Override |