From db40c8d56849d8d3e7863d19df2f37db39e4453c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hrdli=C4=8Dka?= <xhrdlic3@fi.muni.cz>
Date: Thu, 3 Feb 2022 21:08:44 +0100
Subject: [PATCH] Renamed Identifiable to IdentifiableEntity
---
.../data/{Identifiable.java => IdentifiableEntity.java} | 2 +-
.../cz/muni/fi/pv168/project/data/category/Category.java | 4 ++--
.../java/cz/muni/fi/pv168/project/data/task/SubTask.java | 4 ++--
src/main/java/cz/muni/fi/pv168/project/data/task/Task.java | 4 ++--
.../ui/dialog/factory/DependencyTaskDialogFactory.java | 6 +++---
5 files changed, 10 insertions(+), 10 deletions(-)
rename src/main/java/cz/muni/fi/pv168/project/data/{Identifiable.java => IdentifiableEntity.java} (61%)
diff --git a/src/main/java/cz/muni/fi/pv168/project/data/Identifiable.java b/src/main/java/cz/muni/fi/pv168/project/data/IdentifiableEntity.java
similarity index 61%
rename from src/main/java/cz/muni/fi/pv168/project/data/Identifiable.java
rename to src/main/java/cz/muni/fi/pv168/project/data/IdentifiableEntity.java
index ba59f77f..5d160623 100644
--- a/src/main/java/cz/muni/fi/pv168/project/data/Identifiable.java
+++ b/src/main/java/cz/muni/fi/pv168/project/data/IdentifiableEntity.java
@@ -1,6 +1,6 @@
package cz.muni.fi.pv168.project.data;
-public interface Identifiable {
+public interface IdentifiableEntity {
Long getId();
}
diff --git a/src/main/java/cz/muni/fi/pv168/project/data/category/Category.java b/src/main/java/cz/muni/fi/pv168/project/data/category/Category.java
index d1d4e5e8..ffd99a03 100644
--- a/src/main/java/cz/muni/fi/pv168/project/data/category/Category.java
+++ b/src/main/java/cz/muni/fi/pv168/project/data/category/Category.java
@@ -1,6 +1,6 @@
package cz.muni.fi.pv168.project.data.category;
-import cz.muni.fi.pv168.project.data.Identifiable;
+import cz.muni.fi.pv168.project.data.IdentifiableEntity;
import cz.muni.fi.pv168.project.ui.i18n.I18N;
import org.joda.time.Duration;
import org.joda.time.PeriodType;
@@ -11,7 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-public class Category implements Identifiable {
+public class Category implements IdentifiableEntity {
private static final I18N I18N = new I18N(Category.class);
diff --git a/src/main/java/cz/muni/fi/pv168/project/data/task/SubTask.java b/src/main/java/cz/muni/fi/pv168/project/data/task/SubTask.java
index 9afae5d2..b347a240 100644
--- a/src/main/java/cz/muni/fi/pv168/project/data/task/SubTask.java
+++ b/src/main/java/cz/muni/fi/pv168/project/data/task/SubTask.java
@@ -1,10 +1,10 @@
package cz.muni.fi.pv168.project.data.task;
-import cz.muni.fi.pv168.project.data.Identifiable;
+import cz.muni.fi.pv168.project.data.IdentifiableEntity;
import java.util.Objects;
-public class SubTask implements Completable, Identifiable {
+public class SubTask implements Completable, IdentifiableEntity {
private Long id;
private String title;
diff --git a/src/main/java/cz/muni/fi/pv168/project/data/task/Task.java b/src/main/java/cz/muni/fi/pv168/project/data/task/Task.java
index 1bd89fc9..2609f3f8 100644
--- a/src/main/java/cz/muni/fi/pv168/project/data/task/Task.java
+++ b/src/main/java/cz/muni/fi/pv168/project/data/task/Task.java
@@ -1,6 +1,6 @@
package cz.muni.fi.pv168.project.data.task;
-import cz.muni.fi.pv168.project.data.Identifiable;
+import cz.muni.fi.pv168.project.data.IdentifiableEntity;
import cz.muni.fi.pv168.project.data.category.Category;
import org.joda.time.Duration;
@@ -12,7 +12,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
-public class Task implements Completable, Identifiable {
+public class Task implements Completable, IdentifiableEntity {
private Long id;
diff --git a/src/main/java/cz/muni/fi/pv168/project/ui/dialog/factory/DependencyTaskDialogFactory.java b/src/main/java/cz/muni/fi/pv168/project/ui/dialog/factory/DependencyTaskDialogFactory.java
index c8d14aa2..93f1f57c 100644
--- a/src/main/java/cz/muni/fi/pv168/project/ui/dialog/factory/DependencyTaskDialogFactory.java
+++ b/src/main/java/cz/muni/fi/pv168/project/ui/dialog/factory/DependencyTaskDialogFactory.java
@@ -1,6 +1,6 @@
package cz.muni.fi.pv168.project.ui.dialog.factory;
-import cz.muni.fi.pv168.project.data.Identifiable;
+import cz.muni.fi.pv168.project.data.IdentifiableEntity;
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.MtoNDao;
@@ -14,7 +14,7 @@ public class DependencyTaskDialogFactory implements DialogFactory<Task> {
private final DataAccessObject<Task> taskDao;
private final MtoNDao dependencyDao;
- private Identifiable sourceEntity;
+ private IdentifiableEntity sourceEntity;
public DependencyTaskDialogFactory(MtoNDao dependencyDao, DataAccessObject<Task> taskDao) {
this.taskDao = taskDao;
@@ -61,7 +61,7 @@ public class DependencyTaskDialogFactory implements DialogFactory<Task> {
return true;
}
- public void setSourceEntity(Identifiable sourceEntity) {
+ public void setSourceEntity(IdentifiableEntity sourceEntity) {
this.sourceEntity = sourceEntity;
}
}
--
GitLab