diff --git a/src/main/java/cz/muni/fi/pv168/project/model/db/TaskCategoryModel.java b/src/main/java/cz/muni/fi/pv168/project/model/db/TaskCategoryModel.java index 4cee829cb6206d5d91bc8d1716376094cbd01e5b..6aef0fe805ca1ee8d9b7517423f551b27d51e2d6 100644 --- a/src/main/java/cz/muni/fi/pv168/project/model/db/TaskCategoryModel.java +++ b/src/main/java/cz/muni/fi/pv168/project/model/db/TaskCategoryModel.java @@ -2,15 +2,18 @@ package cz.muni.fi.pv168.project.model.db; import cz.muni.fi.pv168.project.data.category.Category; import cz.muni.fi.pv168.project.data.task.Task; +import cz.muni.fi.pv168.project.db.category.CategoryDao; import cz.muni.fi.pv168.project.db.taskcategory.TaskCategoryDao; public class TaskCategoryModel extends AbstractTaskPropertyListDataModel<Category> { private final TaskCategoryDao dataAccessObject; + private final CategoryDao parentDao; - public TaskCategoryModel(TaskCategoryDao dao) { + public TaskCategoryModel(TaskCategoryDao dao, CategoryDao parentDao) { super(Task::getCategories); this.dataAccessObject = dao; + this.parentDao = parentDao; } @Override @@ -27,5 +30,6 @@ public class TaskCategoryModel extends AbstractTaskPropertyListDataModel<Categor @Override public void update(Category entity) { + parentDao.update(entity); } } 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 c5a6bc9f72b5a77f752468215b084db1bcc61791..e8f921ef86f9b5d8f4abb649ce830f13750de758 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 @@ -1,7 +1,7 @@ package cz.muni.fi.pv168.project.ui.main.panel.listholder; import cz.muni.fi.pv168.project.data.category.Category; -import cz.muni.fi.pv168.project.db.interfaces.DataAccessObject; +import cz.muni.fi.pv168.project.db.category.CategoryDao; import cz.muni.fi.pv168.project.db.taskcategory.TaskCategoryDao; import cz.muni.fi.pv168.project.model.db.TaskCategoryModel; import cz.muni.fi.pv168.project.ui.action.AddAction; @@ -20,9 +20,9 @@ public class CategoryHolderPanel extends AbstractHolderPanel<Category> { private final ExistingCategoryDialogFactory factory; - public CategoryHolderPanel(TaskCategoryDao categoryDao, DataAccessObject<Category> parentDao) { + public CategoryHolderPanel(TaskCategoryDao categoryDao, CategoryDao parentDao) { super( - new TaskCategoryModel(categoryDao), "Categories", + new TaskCategoryModel(categoryDao, parentDao), "Categories", new InnerColoredListRenderer<>(Category::getName, Category::getColor, Font.BOLD | Font.ITALIC), Optional.empty());