Arthur Brandao 5 жил өмнө
parent
commit
d1bffa09c4

+ 5 - 0
src/entity/Ecole.java

@@ -26,5 +26,10 @@ public class Ecole implements Persistable {
 	public long getId() {
 		return id;
 	}
+	
+	@Override
+	public String toString() {
+		return libelle + " (" + ville + ") : " + niveau;
+	}
 
 }

+ 4 - 0
src/entity/Espace.java

@@ -18,5 +18,9 @@ public class Espace implements Persistable {
 		return id;
 	}
 	
+	@Override
+	public String toString() {
+		return libelle;
+	}
 
 }

+ 4 - 1
src/entity/Frequentation.java

@@ -29,6 +29,9 @@ public class Frequentation implements Persistable {
 		return id;
 	}
 
-	
+	@Override
+	public String toString() {
+		return "(" + date + ") " + usager + " -> " + espace;
+	}
 	
 }

+ 5 - 0
src/entity/Niveau.java

@@ -17,5 +17,10 @@ public class Niveau implements Persistable {
 	public long getId() {
 		return id;
 	}
+	
+	@Override
+	public String toString() {
+		return libelle;
+	}
 
 }

+ 5 - 0
src/entity/Usager.java

@@ -52,5 +52,10 @@ public class Usager implements Persistable {
 	public long getId() {
 		return 0;
 	}
+	
+	@Override
+	public String toString() {
+		return prenom + " " + nom;
+	}
 
 }

+ 5 - 0
src/entity/Ville.java

@@ -20,5 +20,10 @@ public class Ville implements Persistable {
 	public long getId() {
 		return id;
 	}
+	
+	@Override
+	public String toString() {
+		return libelle + " (" + cp + ")";
+	}
 
 }

+ 4 - 4
src/servlets/TestDb.java

@@ -46,7 +46,7 @@ public class TestDb extends HttpServlet {
 		EcoleTable et = EcoleTable.getInstance();
 		List<Ecole> le = et.getAll();
 		System.out.println("---------------------");
-		le.forEach(elt -> System.out.println(elt.libelle + " " + elt.ville.libelle + " " + elt.niveau.libelle));
+		le.forEach(elt -> System.out.println(elt.libelle + " " + elt.ville + " " + elt.niveau));
 		
 		Ecole e = et.findById(1).get();
 		e.libelle = "Lycée " + e.libelle;
@@ -56,7 +56,7 @@ public class TestDb extends HttpServlet {
 		et = EcoleTable.getInstance();
 		le = et.getAll();
 		System.out.println("---------------------");
-		le.forEach(elt -> System.out.println(elt.libelle + " " + elt.ville.libelle + " " + elt.niveau.libelle));
+		le.forEach(elt -> System.out.println(elt.libelle + " " + elt.ville + " " + elt.niveau));
 		
 		VilleTable vt = VilleTable.getInstance();
 		Ville v = vt.getById(1);
@@ -68,8 +68,8 @@ public class TestDb extends HttpServlet {
 		Usager u = ut.getById(1);
 		System.out.println("---------------------");
 		System.out.println(u.prenom);
-		System.out.println(u.ville.libelle);
-		System.out.println(u.ecole.libelle);
+		System.out.println(u.ville);
+		System.out.println(u.ecole);
 		
 		response.getWriter().append("Served at: ").append(request.getContextPath());
 	}