DELETE PrintLN (because Papy) + Correction warehouse + serializer

SacreeBandeDePote · Dec 5, 2017 · 9d4dca0 · 9d4dca0
1 parent be7f64c
commit 9d4dca0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/agile/src/main/java/lsbdp/agile/data/SerializerXML.java b/agile/src/main/java/lsbdp/agile/data/SerializerXML.java
@@ -49,7 +49,7 @@ public class SerializerXML {
 	 * @param file
 	 */
 	public static void serializeDeliveryXML(DeliverySchedule deliveriesSchedule, File file) {
-		SimpleDateFormat formater = new SimpleDateFormat("HH:mm:ss");
+		SimpleDateFormat formater = new SimpleDateFormat("H:m:s");
 		try {
 			file.createNewFile();
 			FileWriter ffw=new FileWriter(file);

diff --git a/agile/src/main/java/lsbdp/agile/model/DeliverySchedule.java b/agile/src/main/java/lsbdp/agile/model/DeliverySchedule.java
@@ -10,14 +10,14 @@ public class DeliverySchedule extends ArrayList<Pair<Route, Delivery>>{
 	private Date startingTime;
 	private Date endingTime;
 
-	public Intersection getWhareHouse() {
+	public Intersection getWarehouse() {
 		return this.get(0).getKey().getStartingPoint();
 	}
 
 	public String toString() {
 		SimpleDateFormat formater = new SimpleDateFormat("HH:mm:ss");
 
-		Intersection entrepot = this.getWhareHouse();
+		Intersection entrepot = this.getWarehouse();
 		String s = "Entrepôt\r\n";
 		s += "Localisation : Coordonnées X " + entrepot.getX() + " | Y " + entrepot.getY() + "\r\n";
 		s += "Heure de départ : " + formater.format(this.startingTime) +"\r\n";

diff --git a/agile/src/main/java/lsbdp/agile/view/WindowManager.java b/agile/src/main/java/lsbdp/agile/view/WindowManager.java
@@ -87,7 +87,6 @@ public static void colorDeliverySchedule (DeliverySchedule ds) {
 		Intersection warehouse = ds.get(0).getKey().getStartingPoint();
 		canvasDrawer.drawWarehouse(overlay, warehouse, Color.GREEN, 5d);
 		for (Pair<Route, Delivery> p : ds) {
-			System.out.println(p.getKey() +" " + p.getValue());
 			if(p.getKey() != null && p.getValue() != null) {
 				colorRoute(p.getKey(), p.getValue());
 			}