From ea4dd340c9456346d6c139bf1a89f5d05594acdf Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Wed, 8 Sep 2010 08:28:13 +0000 Subject: [PATCH] cosmetics git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@151 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/OebbProvider.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index e8a5139b..c3ba552c 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -324,7 +324,8 @@ public class OebbProvider implements NetworkProvider if (departureId == 0) throw new IllegalStateException("departureId"); - final Date departureTime = ParserUtils.joinDateTime(departureDate, ParserUtils.parseTime(mDetFine.group(4))); + final Date departureTime = ParserUtils.parseTime(mDetFine.group(4)); + final Date departureDateTime = ParserUtils.joinDateTime(departureDate, departureTime); final String departurePosition = mDetFine.group(5) != null ? ParserUtils.resolveEntities(mDetFine.group(5)) : null; @@ -333,12 +334,13 @@ public class OebbProvider implements NetworkProvider if (arrivalId == 0) throw new IllegalStateException("arrivalId"); - final Date arrivalTime = ParserUtils.joinDateTime(arrivalDate, ParserUtils.parseTime(mDetFine.group(11))); + final Date arrivalTime = ParserUtils.parseTime(mDetFine.group(11)); + final Date arrivalDateTime = ParserUtils.joinDateTime(arrivalDate, arrivalTime); final String arrivalPosition = mDetFine.group(12) != null ? ParserUtils.resolveEntities(mDetFine.group(12)) : null; - final Connection.Trip trip = new Connection.Trip(line, LINES.get(line.charAt(0)), null, departureTime, - departurePosition, departureId, departure, arrivalTime, arrivalPosition, arrivalId, arrival); + final Connection.Trip trip = new Connection.Trip(line, LINES.get(line.charAt(0)), null, departureDateTime, + departurePosition, departureId, departure, arrivalDateTime, arrivalPosition, arrivalId, arrival); connection.parts.add(trip); } else