mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-09 17:38:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@188 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-09-24 13:27:08 +00:00
parent b70d373cb3
commit c5212049c3
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/de/schildbach/pte/OebbProvider.java
View file

@ -347,11 +347,9 @@ public class OebbProvider implements NetworkProvider
final String departure = ParserUtils.resolveEntities(mDetFine.group(2)); final String departure = ParserUtils.resolveEntities(mDetFine.group(2));
Date detailsDepartureDate = mDetFine.group(3) != null ? ParserUtils.parseDate(mDetFine.group(3)) : null; Date detailsDepartureDate = mDetFine.group(3) != null ? ParserUtils.parseDate(mDetFine.group(3)) : lastDate;
if (detailsDepartureDate != null) if (detailsDepartureDate != null)
lastDate = detailsDepartureDate; lastDate = detailsDepartureDate;
else
detailsDepartureDate = lastDate;
final Date detailsDepartureTime = ParserUtils.parseTime(mDetFine.group(4)); final Date detailsDepartureTime = ParserUtils.parseTime(mDetFine.group(4));
final Date detailsDepartureDateTime = ParserUtils.joinDateTime(detailsDepartureDate, detailsDepartureTime); final Date detailsDepartureDateTime = ParserUtils.joinDateTime(detailsDepartureDate, detailsDepartureTime);
@ -362,11 +360,9 @@ public class OebbProvider implements NetworkProvider
final String arrival = ParserUtils.resolveEntities(mDetFine.group(9)); final String arrival = ParserUtils.resolveEntities(mDetFine.group(9));
Date detailsArrivalDate = mDetFine.group(10) != null ? ParserUtils.parseDate(mDetFine.group(10)) : null; Date detailsArrivalDate = mDetFine.group(10) != null ? ParserUtils.parseDate(mDetFine.group(10)) : lastDate;
if (detailsArrivalDate != null) if (detailsArrivalDate != null)
lastDate = detailsArrivalDate; lastDate = detailsArrivalDate;
else
detailsArrivalDate = lastDate;
final Date detailsArrivalTime = ParserUtils.parseTime(mDetFine.group(11)); final Date detailsArrivalTime = ParserUtils.parseTime(mDetFine.group(11));
final Date detailsArrivalDateTime = ParserUtils.joinDateTime(detailsArrivalDate, detailsArrivalTime); final Date detailsArrivalDateTime = ParserUtils.joinDateTime(detailsArrivalDate, detailsArrivalTime);

8
src/de/schildbach/pte/SbbProvider.java
View file

@ -344,11 +344,9 @@ public class SbbProvider implements NetworkProvider
final String departure = ParserUtils.resolveEntities(mDetFine.group(2)); final String departure = ParserUtils.resolveEntities(mDetFine.group(2));
Date departureDate = mDetFine.group(3) != null ? ParserUtils.parseDate(mDetFine.group(3)) : null; Date departureDate = mDetFine.group(3) != null ? ParserUtils.parseDate(mDetFine.group(3)) : lastDate;
if (departureDate != null) if (departureDate != null)
lastDate = departureDate; lastDate = departureDate;
else
departureDate = lastDate;
final String lineType = mDetFine.group(6); final String lineType = mDetFine.group(6);
@ -356,11 +354,9 @@ public class SbbProvider implements NetworkProvider
final String arrival = ParserUtils.resolveEntities(mDetFine.group(10)); final String arrival = ParserUtils.resolveEntities(mDetFine.group(10));
Date arrivalDate = mDetFine.group(11) != null ? ParserUtils.parseDate(mDetFine.group(11)) : null; Date arrivalDate = mDetFine.group(11) != null ? ParserUtils.parseDate(mDetFine.group(11)) : lastDate;
if (arrivalDate != null) if (arrivalDate != null)
lastDate = arrivalDate; lastDate = arrivalDate;
else
arrivalDate = lastDate;
if (!lineType.equals("fuss") && !lineType.equals("transfer")) if (!lineType.equals("fuss") && !lineType.equals("transfer"))
{ {