mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-21 01:39:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

get rid of line colors in connection DTO hierarchy

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@456 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-01-16 12:39:08 +00:00
parent aa889974b2
commit 91d310b1dd
7 changed files with 28 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -392,7 +392,7 @@ public final class BvgProvider extends AbstractHafasProvider
arrivalTime = ParserUtils.addDays(arrivalTime, 1);
final String line = normalizeLine(ParserUtils.resolveEntities(mConFine.group(4)));
final Connection connection = new Connection(AbstractHafasProvider.extractConnectionId(link), link, departureTime, arrivalTime,
line, line != null ? lineColors(line) : null, 0, from.name, 0, to.name, null, null);
line, 0, from.name, 0, to.name, null, null);
connections.add(connection);
}
else
@ -495,8 +495,8 @@ public final class BvgProvider extends AbstractHafasProvider
final String arrival = ParserUtils.resolveEntities(mDetFine.group(10));
parts.add(new Connection.Trip(line, line != null ? lineColors(line) : null, destination, departureTime, departurePosition,
departureId, departure, arrivalTime, arrivalPosition, arrivalId, arrival, null));
parts.add(new Connection.Trip(line, destination, departureTime, departurePosition, departureId, departure, arrivalTime,
arrivalPosition, arrivalId, arrival, null));
if (firstDepartureTime == null)
firstDepartureTime = departureTime;
@ -540,7 +540,7 @@ public final class BvgProvider extends AbstractHafasProvider
if (firstDepartureTime != null && lastArrivalTime != null)
return new GetConnectionDetailsResult(currentDate, new Connection(AbstractHafasProvider.extractConnectionId(uri), uri,
firstDepartureTime, lastArrivalTime, null, null, firstDepartureId, firstDeparture, lastArrivalId, lastArrival, parts, null));
firstDepartureTime, lastArrivalTime, null, firstDepartureId, firstDeparture, lastArrivalId, lastArrival, parts, null));
else
return new GetConnectionDetailsResult(currentDate, null);
}