Renommage

src/db/Table.java → src/db/DatabaseTable.java

@@ -16,7 +16,7 @@ import db.annotation.DbLink;
 import db.annotation.DbTable;
 import db.mapper.DbMapper;
 
-public abstract class Table<T extends Persistable> {
+public abstract class DatabaseTable<T extends Persistable> {
 	
 	private Map<Long, T> cacheMap = new HashMap<>();
 	

src/db/mapper/DbMapper.java

@@ -7,7 +7,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import db.Table;
+import db.DatabaseTable;
 import db.annotation.DbField;
 import db.annotation.DbLink;
 import db.annotation.DbTable;
@@ -38,7 +38,7 @@ public class DbMapper {
 								String className = split[split.length - 1];
 								// Chargement de la class Table qui gère l'entité
 								Class<?> clazz = Class.forName(field.getAnnotation(DbLink.class).value() + "." + className + "Table");
-								Table table = (Table) clazz.getMethod("getInstance").invoke(null);
+								DatabaseTable table = (DatabaseTable) clazz.getMethod("getInstance").invoke(null);
 								value = table.getById(otherId);
 							}
 						}
@@ -78,7 +78,7 @@ public class DbMapper {
 									String className = split[split.length - 1];
 									// Chargement de la class Table qui gère l'entité
 									Class<?> clazz = Class.forName(field.getAnnotation(DbLink.class).value() + "." + className + "Table");
-									Table table = (Table) clazz.getMethod("getInstance").invoke(null);
+									DatabaseTable table = (DatabaseTable) clazz.getMethod("getInstance").invoke(null);
 									val = table.getById(otherId);
 								}
 							}

src/db/table/EcoleTable.java

@@ -1,11 +1,11 @@
 package db.table;
 
-import db.Table;
+import db.DatabaseTable;
 import db.annotation.DbTable;
 import entity.Ecole;
 
 @DbTable(name = "Ecole", entity = Ecole.class)
-public class EcoleTable extends Table<Ecole> {
+public class EcoleTable extends DatabaseTable<Ecole> {
 	
 	private static EcoleTable instance;
 	

src/db/table/EspaceTable.java

@@ -3,12 +3,12 @@ package db.table;
 import java.util.List;
 import java.util.Optional;
 
-import db.Table;
+import db.DatabaseTable;
 import db.annotation.DbTable;
 import entity.Espace;
 
 @DbTable(name = "Espace", entity = Espace.class)
-public class EspaceTable extends Table<Espace>{
+public class EspaceTable extends DatabaseTable<Espace>{
 	
 	private static EspaceTable instance;
 	

src/db/table/FrequentationTable.java

@@ -1,11 +1,11 @@
 package db.table;
 
-import db.Table;
+import db.DatabaseTable;
 import db.annotation.DbTable;
 import entity.Frequentation;
 
 @DbTable(name = "Frequentation", entity = Frequentation.class)
-public class FrequentationTable extends Table<Frequentation>{
+public class FrequentationTable extends DatabaseTable<Frequentation>{
 
 	private static FrequentationTable instance;
 	

src/db/table/NiveauTable.java

@@ -1,11 +1,11 @@
 package db.table;
 
-import db.Table;
+import db.DatabaseTable;
 import db.annotation.DbTable;
 import entity.Niveau;
 
 @DbTable(name = "Niveau", entity = Niveau.class)
-public class NiveauTable extends Table<Niveau> {
+public class NiveauTable extends DatabaseTable<Niveau> {
 	
 	private static NiveauTable instance;
 	

src/db/table/UsagerTable.java

@@ -3,12 +3,12 @@ package db.table;
 import java.util.List;
 import java.util.Optional;
 
-import db.Table;
+import db.DatabaseTable;
 import db.annotation.DbTable;
 import entity.Usager;
 
 @DbTable(name = "Usager", entity = Usager.class)
-public class UsagerTable extends Table<Usager> {
+public class UsagerTable extends DatabaseTable<Usager> {
 	
 	private static UsagerTable instance;
 	

src/db/table/VilleTable.java

@@ -3,12 +3,12 @@ package db.table;
 import java.util.List;
 import java.util.Optional;
 
-import db.Table;
+import db.DatabaseTable;
 import db.annotation.DbTable;
 import entity.Ville;
 
 @DbTable(name = "Ville", entity = Ville.class)
-public class VilleTable extends Table<Ville> {
+public class VilleTable extends DatabaseTable<Ville> {
 	
 	private static VilleTable instance;