From 1f9a35c228b9f7b98e3a346bc9493e7e8fbfb87d Mon Sep 17 00:00:00 2001
From: LO Kam Tao Leo <leolo@leolo.org>
Date: Sat, 5 Mar 2022 12:08:19 +0000
Subject: [PATCH] Fixed incorrect hashCode() function

---
 src/org/leolo/rail/model/TrainSchedule.java         | 6 +++---
 src/org/leolo/rail/model/TrainScheduleLocation.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/leolo/rail/model/TrainSchedule.java b/src/org/leolo/rail/model/TrainSchedule.java
index 4936473..2fcd8fb 100644
--- a/src/org/leolo/rail/model/TrainSchedule.java
+++ b/src/org/leolo/rail/model/TrainSchedule.java
@@ -177,7 +177,7 @@ public class TrainSchedule {
 	}
 	@Override
 	public int hashCode() {
-		log.info("startdate:{}", startDate.getTime());
+//		log.info("startdate:{}", startDate.getTime());
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + ((atocCode == null) ? 0 : atocCode.hashCode());
@@ -191,7 +191,7 @@ public class TrainSchedule {
 		result = prime * result + ((powerType == null) ? 0 : powerType.hashCode());
 		result = prime * result + ((reservation == null) ? 0 : reservation.hashCode());
 		result = prime * result + ((rsid == null) ? 0 : rsid.hashCode());
-		result = prime * result + ((scheduleType == null) ? 0 : scheduleType.hashCode());
+		result = prime * result + ((scheduleType == null) ? 0 : scheduleType.name().hashCode());
 		result = prime * result + ((section == null) ? 0 : section.hashCode());
 		result = prime * result + ((signalId == null) ? 0 : signalId.hashCode());
 		result = prime * result + ((sleeper == null) ? 0 : sleeper.hashCode());
@@ -202,7 +202,7 @@ public class TrainSchedule {
 		result = prime * result + ((trainUId == null) ? 0 : trainUId.hashCode());
 		result = prime * result + ((uicCode == null) ? 0 : uicCode.hashCode());
 		for(TrainScheduleLocation tsl:locations) {
-			log.atDebug().log("TIPLOC: {}, hash: {}//{}", tsl.getTiplocCode(), Integer.toHexString(tsl.hashCode()), Integer.toHexString(tsl.getTiplocCode().hashCode()));
+//			log.atDebug().log("TIPLOC: {}, hash: {}//{}", tsl.getTiplocCode(), Integer.toHexString(tsl.hashCode()), Integer.toHexString(tsl.getTiplocCode().hashCode()));
 			result = prime * result + tsl.hashCode();
 		}
 		return result;
diff --git a/src/org/leolo/rail/model/TrainScheduleLocation.java b/src/org/leolo/rail/model/TrainScheduleLocation.java
index 6ad479f..e43988d 100644
--- a/src/org/leolo/rail/model/TrainScheduleLocation.java
+++ b/src/org/leolo/rail/model/TrainScheduleLocation.java
@@ -115,7 +115,7 @@ public class TrainScheduleLocation {
 		result = prime * result + ((platform == null) ? 0 : platform.hashCode());
 		result = prime * result + (int) (pubArrival ^ (pubArrival >>> 32));
 		result = prime * result + (int) (pubDeparture ^ (pubDeparture >>> 32));
-		result = prime * result + ((recordType == null) ? 0 : recordType.hashCode());
+		result = prime * result + ((recordType == null) ? 0 : recordType.getRecordCode().hashCode());
 		result = prime * result + ((tiplocCode == null) ? 0 : tiplocCode.hashCode());
 		result = prime * result + tiplocInstance;
 		return result;