Skip to content
Snippets Groups Projects
Commit 7ff41c61 authored by Matej Dipčár's avatar Matej Dipčár
Browse files

Remove unused `TaskModel` in holder panels

parent 0f8b976d
No related branches found
No related tags found
2 merge requests!52Final project MR,!46UI <--> DB refactor
...@@ -5,7 +5,6 @@ import cz.muni.fi.pv168.project.data.task.Task; ...@@ -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.interfaces.DataAccessObject;
import cz.muni.fi.pv168.project.db.taskcategory.TaskCategoryDao; 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.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.AddAction;
import cz.muni.fi.pv168.project.ui.action.DeleteAction; import cz.muni.fi.pv168.project.ui.action.DeleteAction;
import cz.muni.fi.pv168.project.ui.action.EditAction; import cz.muni.fi.pv168.project.ui.action.EditAction;
...@@ -24,7 +23,7 @@ public class CategoryHolderPanel extends AbstractHolderPanel<Category> { ...@@ -24,7 +23,7 @@ public class CategoryHolderPanel extends AbstractHolderPanel<Category> {
private final TaskCategoryModel dataModel; private final TaskCategoryModel dataModel;
private final ExistingCategoryDialogFactory factory; private final ExistingCategoryDialogFactory factory;
public CategoryHolderPanel(TaskModel taskModel, TaskCategoryDao categoryDao, DataAccessObject<Category> parentDao) { public CategoryHolderPanel(TaskCategoryDao categoryDao, DataAccessObject<Category> parentDao) {
super( super(
"Categories", "Categories",
new InnerColoredListRenderer<>(Category::getName, Category::getColor, Font.BOLD | Font.ITALIC), new InnerColoredListRenderer<>(Category::getName, Category::getColor, Font.BOLD | Font.ITALIC),
......
...@@ -4,7 +4,6 @@ import cz.muni.fi.pv168.project.data.task.Task; ...@@ -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.dependency.DependencyDao;
import cz.muni.fi.pv168.project.db.task.TaskDao; 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.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.AddAction;
import cz.muni.fi.pv168.project.ui.action.DeleteAction; import cz.muni.fi.pv168.project.ui.action.DeleteAction;
import cz.muni.fi.pv168.project.ui.action.task.GoToAction; import cz.muni.fi.pv168.project.ui.action.task.GoToAction;
...@@ -24,7 +23,7 @@ public class DependencyHolderPanel extends AbstractHolderPanel<Task> { ...@@ -24,7 +23,7 @@ public class DependencyHolderPanel extends AbstractHolderPanel<Task> {
private final TaskDependencyModel dataModel; private final TaskDependencyModel dataModel;
private final DependencyTaskDialogFactory factory; 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( super(
"Dependencies", "Dependencies",
new TaskStatusListRenderer<>(Task::getTitle, Task::getTaskStatus, Task::isUrgent, Font.PLAIN), new TaskStatusListRenderer<>(Task::getTitle, Task::getTaskStatus, Task::isUrgent, Font.PLAIN),
......
...@@ -5,7 +5,6 @@ import cz.muni.fi.pv168.project.data.task.Task; ...@@ -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.data.task.TaskStatus;
import cz.muni.fi.pv168.project.db.subtask.SubTaskDao; 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.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.AddAction;
import cz.muni.fi.pv168.project.ui.action.DeleteAction; import cz.muni.fi.pv168.project.ui.action.DeleteAction;
import cz.muni.fi.pv168.project.ui.action.EditAction; import cz.muni.fi.pv168.project.ui.action.EditAction;
...@@ -24,7 +23,7 @@ public class SubTaskHolderPanel extends AbstractHolderPanel<SubTask> { ...@@ -24,7 +23,7 @@ public class SubTaskHolderPanel extends AbstractHolderPanel<SubTask> {
private final SubTaskModel dataModel; private final SubTaskModel dataModel;
public SubTaskHolderPanel(TaskModel taskModel, SubTaskDao subTaskDao) { public SubTaskHolderPanel(SubTaskDao subTaskDao) {
super( super(
"Sub tasks", "Sub tasks",
new TaskStatusListRenderer<>(SubTask::getTitle, new TaskStatusListRenderer<>(SubTask::getTitle,
......
...@@ -64,9 +64,9 @@ public class TaskView implements Tab<Task> { ...@@ -64,9 +64,9 @@ public class TaskView implements Tab<Task> {
headerList.setCellRenderer(new TaskListRenderer()); headerList.setCellRenderer(new TaskListRenderer());
headerList.setBorder(new EtchedBorder()); headerList.setBorder(new EtchedBorder());
categoryHolder = new CategoryHolderPanel(taskModel, daoHolder.getTaskCategoryDao(), daoHolder.getCategoryDao()); categoryHolder = new CategoryHolderPanel(daoHolder.getTaskCategoryDao(), daoHolder.getCategoryDao());
subTaskHolder = new SubTaskHolderPanel(taskModel, daoHolder.getSubTaskDao()); subTaskHolder = new SubTaskHolderPanel(daoHolder.getSubTaskDao());
dependencyHolder = new DependencyHolderPanel(taskModel, headerList, daoHolder.getDependencyDao(), daoHolder.getTaskDao()); dependencyHolder = new DependencyHolderPanel(headerList, daoHolder.getDependencyDao(), daoHolder.getTaskDao());
taskPanel = new TaskPanel(categoryHolder, subTaskHolder, dependencyHolder); taskPanel = new TaskPanel(categoryHolder, subTaskHolder, dependencyHolder);
cardPanel = new CardPanel() cardPanel = new CardPanel()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment