From 7ff41c619e1211fd48ae62b499a2bf504bd086a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Dip=C4=8D=C3=A1r?= <492666@mail.muni.cz>
Date: Mon, 31 Jan 2022 12:07:40 +0100
Subject: [PATCH] Remove unused `TaskModel` in holder panels
---
.../ui/main/panel/listholder/CategoryHolderPanel.java | 3 +--
.../ui/main/panel/listholder/DependencyHolderPanel.java | 3 +--
.../ui/main/panel/listholder/SubTaskHolderPanel.java | 3 +--
.../cz/muni/fi/pv168/project/ui/main/view/TaskView.java | 6 +++---
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/CategoryHolderPanel.java b/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/CategoryHolderPanel.java
index 2945afbf..c4b1701f 100644
--- a/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/CategoryHolderPanel.java
+++ b/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/CategoryHolderPanel.java
@@ -5,7 +5,6 @@ import cz.muni.fi.pv168.project.data.task.Task;
import cz.muni.fi.pv168.project.db.interfaces.DataAccessObject;
import cz.muni.fi.pv168.project.db.taskcategory.TaskCategoryDao;
import cz.muni.fi.pv168.project.model.db.TaskCategoryModel;
-import cz.muni.fi.pv168.project.model.db.TaskModel;
import cz.muni.fi.pv168.project.ui.action.AddAction;
import cz.muni.fi.pv168.project.ui.action.DeleteAction;
import cz.muni.fi.pv168.project.ui.action.EditAction;
@@ -24,7 +23,7 @@ public class CategoryHolderPanel extends AbstractHolderPanel<Category> {
private final TaskCategoryModel dataModel;
private final ExistingCategoryDialogFactory factory;
- public CategoryHolderPanel(TaskModel taskModel, TaskCategoryDao categoryDao, DataAccessObject<Category> parentDao) {
+ public CategoryHolderPanel(TaskCategoryDao categoryDao, DataAccessObject<Category> parentDao) {
super(
"Categories",
new InnerColoredListRenderer<>(Category::getName, Category::getColor, Font.BOLD | Font.ITALIC),
diff --git a/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/DependencyHolderPanel.java b/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/DependencyHolderPanel.java
index 65846fce..bf835cee 100644
--- a/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/DependencyHolderPanel.java
+++ b/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/DependencyHolderPanel.java
@@ -4,7 +4,6 @@ import cz.muni.fi.pv168.project.data.task.Task;
import cz.muni.fi.pv168.project.db.dependency.DependencyDao;
import cz.muni.fi.pv168.project.db.task.TaskDao;
import cz.muni.fi.pv168.project.model.db.TaskDependencyModel;
-import cz.muni.fi.pv168.project.model.db.TaskModel;
import cz.muni.fi.pv168.project.ui.action.AddAction;
import cz.muni.fi.pv168.project.ui.action.DeleteAction;
import cz.muni.fi.pv168.project.ui.action.task.GoToAction;
@@ -24,7 +23,7 @@ public class DependencyHolderPanel extends AbstractHolderPanel<Task> {
private final TaskDependencyModel dataModel;
private final DependencyTaskDialogFactory factory;
- public DependencyHolderPanel(TaskModel taskModel, JList<Task> superiorTaskList, DependencyDao dependencyDao, TaskDao taskDao) {
+ public DependencyHolderPanel(JList<Task> superiorTaskList, DependencyDao dependencyDao, TaskDao taskDao) {
super(
"Dependencies",
new TaskStatusListRenderer<>(Task::getTitle, Task::getTaskStatus, Task::isUrgent, Font.PLAIN),
diff --git a/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/SubTaskHolderPanel.java b/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/SubTaskHolderPanel.java
index 40f870f2..9e36304d 100644
--- a/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/SubTaskHolderPanel.java
+++ b/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/SubTaskHolderPanel.java
@@ -5,7 +5,6 @@ import cz.muni.fi.pv168.project.data.task.Task;
import cz.muni.fi.pv168.project.data.task.TaskStatus;
import cz.muni.fi.pv168.project.db.subtask.SubTaskDao;
import cz.muni.fi.pv168.project.model.db.SubTaskModel;
-import cz.muni.fi.pv168.project.model.db.TaskModel;
import cz.muni.fi.pv168.project.ui.action.AddAction;
import cz.muni.fi.pv168.project.ui.action.DeleteAction;
import cz.muni.fi.pv168.project.ui.action.EditAction;
@@ -24,7 +23,7 @@ public class SubTaskHolderPanel extends AbstractHolderPanel<SubTask> {
private final SubTaskModel dataModel;
- public SubTaskHolderPanel(TaskModel taskModel, SubTaskDao subTaskDao) {
+ public SubTaskHolderPanel(SubTaskDao subTaskDao) {
super(
"Sub tasks",
new TaskStatusListRenderer<>(SubTask::getTitle,
diff --git a/src/main/java/cz/muni/fi/pv168/project/ui/main/view/TaskView.java b/src/main/java/cz/muni/fi/pv168/project/ui/main/view/TaskView.java
index 723fe4ee..3889e722 100644
--- a/src/main/java/cz/muni/fi/pv168/project/ui/main/view/TaskView.java
+++ b/src/main/java/cz/muni/fi/pv168/project/ui/main/view/TaskView.java
@@ -64,9 +64,9 @@ public class TaskView implements Tab<Task> {
headerList.setCellRenderer(new TaskListRenderer());
headerList.setBorder(new EtchedBorder());
- categoryHolder = new CategoryHolderPanel(taskModel, daoHolder.getTaskCategoryDao(), daoHolder.getCategoryDao());
- subTaskHolder = new SubTaskHolderPanel(taskModel, daoHolder.getSubTaskDao());
- dependencyHolder = new DependencyHolderPanel(taskModel, headerList, daoHolder.getDependencyDao(), daoHolder.getTaskDao());
+ categoryHolder = new CategoryHolderPanel(daoHolder.getTaskCategoryDao(), daoHolder.getCategoryDao());
+ subTaskHolder = new SubTaskHolderPanel(daoHolder.getSubTaskDao());
+ dependencyHolder = new DependencyHolderPanel(headerList, daoHolder.getDependencyDao(), daoHolder.getTaskDao());
taskPanel = new TaskPanel(categoryHolder, subTaskHolder, dependencyHolder);
cardPanel = new CardPanel()
--
GitLab