mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-19 00:39:58 +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/AbstractEfaProvider.java
View file

@ -1284,8 +1284,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
intermediateStops.remove(intermediateStops.size() - 1); intermediateStops.remove(intermediateStops.size() - 1);
} }
parts.add(new Connection.Trip(line, lineColors(line), destination, departureTime.getTime(), departurePosition, parts.add(new Connection.Trip(line, destination, departureTime.getTime(), departurePosition, departureId, departure,
departureId, departure, arrivalTime.getTime(), arrivalPosition, arrivalId, arrival, intermediateStops)); arrivalTime.getTime(), arrivalPosition, arrivalId, arrival, intermediateStops));
} }
XmlPullUtil.exit(pp, "itdPartialRoute"); XmlPullUtil.exit(pp, "itdPartialRoute");
@ -1330,8 +1330,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
} }
XmlPullUtil.exit(pp, "itdFare"); XmlPullUtil.exit(pp, "itdFare");
} }
connections.add(new Connection(id, uri, firstDepartureTime, lastArrivalTime, null, null, 0, firstDeparture, 0, lastArrival, connections.add(new Connection(id, uri, firstDepartureTime, lastArrivalTime, null, 0, firstDeparture, 0, lastArrival, parts,
parts, fares.isEmpty() ? null : fares)); fares.isEmpty() ? null : fares));
XmlPullUtil.exit(pp, "itdRoute"); XmlPullUtil.exit(pp, "itdRoute");
} }

6
src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -424,8 +424,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
if (min == 0 || line != null) if (min == 0 || line != null)
{ {
parts.add(new Connection.Trip(line, lineColors(line), destination, departureTime, departurePos, sectionDeparture.id, parts.add(new Connection.Trip(line, destination, departureTime, departurePos, sectionDeparture.id, sectionDeparture.name,
sectionDeparture.name, arrivalTime, arrivalPos, sectionArrival.id, sectionArrival.name, null)); arrivalTime, arrivalPos, sectionArrival.id, sectionArrival.name, null));
} }
else else
{ {
@ -450,7 +450,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
XmlPullUtil.exit(pp); XmlPullUtil.exit(pp);
connections.add(new Connection(id, null, firstDepartureTime, lastArrivalTime, null, null, departure.id, departure.name, arrival.id, connections.add(new Connection(id, null, firstDepartureTime, lastArrivalTime, null, departure.id, departure.name, arrival.id,
arrival.name, parts, null)); arrival.name, parts, null));
} }

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

@ -272,7 +272,7 @@ public final class BahnProvider extends AbstractHafasProvider
else else
line = null; line = null;
final Connection connection = new Connection(AbstractHafasProvider.extractConnectionId(link), link, departureTime, arrivalTime, 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); connections.add(connection);
} }
else else
@ -373,8 +373,8 @@ public final class BahnProvider extends AbstractHafasProvider
final Date departureDateTime = ParserUtils.joinDateTime(departureDate, departureTime); final Date departureDateTime = ParserUtils.joinDateTime(departureDate, departureTime);
final Date arrivalDateTime = ParserUtils.joinDateTime(arrivalDate, arrivalTime); final Date arrivalDateTime = ParserUtils.joinDateTime(arrivalDate, arrivalTime);
lastTrip = new Connection.Trip(line, line != null ? lineColors(line) : null, null, departureDateTime, departurePosition, lastTrip = new Connection.Trip(line, null, departureDateTime, departurePosition, 0, departure, arrivalDateTime,
0, departure, arrivalDateTime, arrivalPosition, 0, arrival, null); arrivalPosition, 0, arrival, null);
parts.add(lastTrip); parts.add(lastTrip);
if (firstDepartureTime == null) if (firstDepartureTime == null)
@ -420,7 +420,7 @@ public final class BahnProvider extends AbstractHafasProvider
throw new IllegalStateException("could not parse all parts of:\n" + mHead.group(1) + "\n" + parts); throw new IllegalStateException("could not parse all parts of:\n" + mHead.group(1) + "\n" + parts);
return new GetConnectionDetailsResult(new Date(), new Connection(AbstractHafasProvider.extractConnectionId(uri), uri, firstDepartureTime, return new GetConnectionDetailsResult(new Date(), new Connection(AbstractHafasProvider.extractConnectionId(uri), uri, firstDepartureTime,
lastArrivalTime, null, null, 0, firstDeparture, 0, lastArrival, parts, null)); lastArrivalTime, null, 0, firstDeparture, 0, lastArrival, parts, null));
} }
else else
{ {

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

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

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

@ -409,7 +409,7 @@ public class OebbProvider extends AbstractHafasProvider
: overviewDepartureDate, ParserUtils.parseTime(mConFine.group(4))); : overviewDepartureDate, ParserUtils.parseTime(mConFine.group(4)));
final String link = allDetailsUri; // TODO use print link? final String link = allDetailsUri; // TODO use print link?
final Connection connection = new Connection(id, link, overviewDepartureTime, overviewArrivalTime, null, null, 0, from.name, 0, final Connection connection = new Connection(id, link, overviewDepartureTime, overviewArrivalTime, null, 0, from.name, 0,
to.name, new ArrayList<Connection.Part>(1), null); to.name, new ArrayList<Connection.Part>(1), null);
connections.add(connection); connections.add(connection);
@ -462,8 +462,8 @@ public class OebbProvider extends AbstractHafasProvider
final Location destination = mDetFine.group(13) != null ? new Location(LocationType.ANY, 0, null, final Location destination = mDetFine.group(13) != null ? new Location(LocationType.ANY, 0, null,
ParserUtils.resolveEntities(mDetFine.group(13))) : null; ParserUtils.resolveEntities(mDetFine.group(13))) : null;
final Connection.Trip trip = new Connection.Trip(line, lineColors(line), destination, detailsDepartureDateTime, final Connection.Trip trip = new Connection.Trip(line, destination, detailsDepartureDateTime, departurePosition,
departurePosition, departureId, departure, detailsArrivalDateTime, arrivalPosition, arrivalId, arrival, null); departureId, departure, detailsArrivalDateTime, arrivalPosition, arrivalId, arrival, null);
connection.parts.add(trip); connection.parts.add(trip);
} }
else else

10
src/de/schildbach/pte/RmvProvider.java
View file

@ -276,8 +276,8 @@ public class RmvProvider extends AbstractHafasProvider
line = normalizeLine(line); line = normalizeLine(line);
else else
line = null; line = null;
final Connection connection = new Connection(extractConnectionId(link), link, departureTime, arrivalTime, line, final Connection connection = new Connection(extractConnectionId(link), link, departureTime, arrivalTime, line, 0, from.name, 0,
line != null ? lineColors(line) : null, 0, from.name, 0, to.name, null, null); to.name, null, null);
connections.add(connection); connections.add(connection);
} }
else else
@ -362,8 +362,8 @@ public class RmvProvider extends AbstractHafasProvider
final String arrivalPosition = ParserUtils.resolveEntities(mDetFine.group(6)); final String arrivalPosition = ParserUtils.resolveEntities(mDetFine.group(6));
lastTrip = new Connection.Trip(line, line != null ? lineColors(line) : null, destination, departureTime, departurePosition, lastTrip = new Connection.Trip(line, destination, departureTime, departurePosition, 0, departure, arrivalTime,
0, departure, arrivalTime, arrivalPosition, 0, arrival, null); arrivalPosition, 0, arrival, null);
parts.add(lastTrip); parts.add(lastTrip);
if (firstDepartureTime == null) if (firstDepartureTime == null)
@ -391,7 +391,7 @@ public class RmvProvider extends AbstractHafasProvider
} }
return new GetConnectionDetailsResult(currentDate, new Connection(extractConnectionId(uri), uri, firstDepartureTime, lastArrivalTime, return new GetConnectionDetailsResult(currentDate, new Connection(extractConnectionId(uri), uri, firstDepartureTime, lastArrivalTime,
null, null, 0, firstDeparture, 0, lastArrival, parts, null)); null, 0, firstDeparture, 0, lastArrival, parts, null));
} }
else else
{ {

15
src/de/schildbach/pte/dto/Connection.java
View file

@ -32,7 +32,6 @@ public final class Connection implements Serializable
public final Date departureTime; public final Date departureTime;
public final Date arrivalTime; public final Date arrivalTime;
public final String line; public final String line;
public final int[] lineColors;
public final int fromId; public final int fromId;
public final String from; public final String from;
public final int toId; public final int toId;
@ -40,16 +39,14 @@ public final class Connection implements Serializable
public final List<Part> parts; public final List<Part> parts;
public final List<Fare> fares; public final List<Fare> fares;
public Connection(final String id, final String link, final Date departureTime, final Date arrivalTime, final String line, public Connection(final String id, final String link, final Date departureTime, final Date arrivalTime, final String line, final int fromId,
final int[] lineColors, final int fromId, final String from, final int toId, final String to, final List<Part> parts, final String from, final int toId, final String to, final List<Part> parts, final List<Fare> fares)
final List<Fare> fares)
{ {
this.id = id; this.id = id;
this.link = link; this.link = link;
this.departureTime = departureTime; this.departureTime = departureTime;
this.arrivalTime = arrivalTime; this.arrivalTime = arrivalTime;
this.line = line; this.line = line;
this.lineColors = lineColors;
this.fromId = fromId; this.fromId = fromId;
this.from = from; this.from = from;
this.toId = toId; this.toId = toId;
@ -89,7 +86,6 @@ public final class Connection implements Serializable
public final static class Trip implements Part public final static class Trip implements Part
{ {
public final String line; public final String line;
public final int[] lineColors;
public final Location destination; public final Location destination;
public final Date departureTime; public final Date departureTime;
public final String departurePosition; public final String departurePosition;
@ -101,12 +97,11 @@ public final class Connection implements Serializable
public final String arrival; public final String arrival;
public final List<Stop> intermediateStops; public final List<Stop> intermediateStops;
public Trip(final String line, final int[] lineColors, final Location destination, final Date departureTime, final String departurePosition, public Trip(final String line, final Location destination, final Date departureTime, final String departurePosition, final int departureId,
final int departureId, final String departure, final Date arrivalTime, final String arrivalPosition, final int arrivalId, final String departure, final Date arrivalTime, final String arrivalPosition, final int arrivalId, final String arrival,
final String arrival, final List<Stop> intermediateStops) final List<Stop> intermediateStops)
{ {
this.line = line; this.line = line;
this.lineColors = lineColors;
this.destination = destination; this.destination = destination;
this.departureTime = departureTime; this.departureTime = departureTime;
this.departurePosition = departurePosition; this.departurePosition = departurePosition;