diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index 9b47d0fc..e1b69462 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1284,8 +1284,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider intermediateStops.remove(intermediateStops.size() - 1); } - parts.add(new Connection.Trip(line, lineColors(line), destination, departureTime.getTime(), departurePosition, - departureId, departure, arrivalTime.getTime(), arrivalPosition, arrivalId, arrival, intermediateStops)); + parts.add(new Connection.Trip(line, destination, departureTime.getTime(), departurePosition, departureId, departure, + arrivalTime.getTime(), arrivalPosition, arrivalId, arrival, intermediateStops)); } XmlPullUtil.exit(pp, "itdPartialRoute"); @@ -1330,8 +1330,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider } XmlPullUtil.exit(pp, "itdFare"); } - connections.add(new Connection(id, uri, firstDepartureTime, lastArrivalTime, null, null, 0, firstDeparture, 0, lastArrival, - parts, fares.isEmpty() ? null : fares)); + connections.add(new Connection(id, uri, firstDepartureTime, lastArrivalTime, null, 0, firstDeparture, 0, lastArrival, parts, + fares.isEmpty() ? null : fares)); XmlPullUtil.exit(pp, "itdRoute"); } diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java index 9dc02c3d..25e6de6b 100644 --- a/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/src/de/schildbach/pte/AbstractHafasProvider.java @@ -424,8 +424,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider if (min == 0 || line != null) { - parts.add(new Connection.Trip(line, lineColors(line), destination, departureTime, departurePos, sectionDeparture.id, - sectionDeparture.name, arrivalTime, arrivalPos, sectionArrival.id, sectionArrival.name, null)); + parts.add(new Connection.Trip(line, destination, departureTime, departurePos, sectionDeparture.id, sectionDeparture.name, + arrivalTime, arrivalPos, sectionArrival.id, sectionArrival.name, null)); } else { @@ -450,7 +450,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider 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)); } diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index 30e61384..31672956 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -272,7 +272,7 @@ public final class BahnProvider extends AbstractHafasProvider else line = null; 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 @@ -373,8 +373,8 @@ public final class BahnProvider extends AbstractHafasProvider final Date departureDateTime = ParserUtils.joinDateTime(departureDate, departureTime); final Date arrivalDateTime = ParserUtils.joinDateTime(arrivalDate, arrivalTime); - lastTrip = new Connection.Trip(line, line != null ? lineColors(line) : null, null, departureDateTime, departurePosition, - 0, departure, arrivalDateTime, arrivalPosition, 0, arrival, null); + lastTrip = new Connection.Trip(line, null, departureDateTime, departurePosition, 0, departure, arrivalDateTime, + arrivalPosition, 0, arrival, null); parts.add(lastTrip); 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); 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 { diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java index 4f40f41f..c22b291c 100644 --- a/src/de/schildbach/pte/BvgProvider.java +++ b/src/de/schildbach/pte/BvgProvider.java @@ -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); } diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index 89d805f4..b870e77a 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -409,7 +409,7 @@ public class OebbProvider extends AbstractHafasProvider : overviewDepartureDate, ParserUtils.parseTime(mConFine.group(4))); 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(1), null); 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, ParserUtils.resolveEntities(mDetFine.group(13))) : null; - final Connection.Trip trip = new Connection.Trip(line, lineColors(line), destination, detailsDepartureDateTime, - departurePosition, departureId, departure, detailsArrivalDateTime, arrivalPosition, arrivalId, arrival, null); + final Connection.Trip trip = new Connection.Trip(line, destination, detailsDepartureDateTime, departurePosition, + departureId, departure, detailsArrivalDateTime, arrivalPosition, arrivalId, arrival, null); connection.parts.add(trip); } else diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java index c53c8f98..0909b729 100644 --- a/src/de/schildbach/pte/RmvProvider.java +++ b/src/de/schildbach/pte/RmvProvider.java @@ -276,8 +276,8 @@ public class RmvProvider extends AbstractHafasProvider line = normalizeLine(line); else line = null; - final Connection connection = new Connection(extractConnectionId(link), link, departureTime, arrivalTime, line, - line != null ? lineColors(line) : null, 0, from.name, 0, to.name, null, null); + final Connection connection = new Connection(extractConnectionId(link), link, departureTime, arrivalTime, line, 0, from.name, 0, + to.name, null, null); connections.add(connection); } else @@ -362,8 +362,8 @@ public class RmvProvider extends AbstractHafasProvider final String arrivalPosition = ParserUtils.resolveEntities(mDetFine.group(6)); - lastTrip = new Connection.Trip(line, line != null ? lineColors(line) : null, destination, departureTime, departurePosition, - 0, departure, arrivalTime, arrivalPosition, 0, arrival, null); + lastTrip = new Connection.Trip(line, destination, departureTime, departurePosition, 0, departure, arrivalTime, + arrivalPosition, 0, arrival, null); parts.add(lastTrip); if (firstDepartureTime == null) @@ -391,7 +391,7 @@ public class RmvProvider extends AbstractHafasProvider } 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 { diff --git a/src/de/schildbach/pte/dto/Connection.java b/src/de/schildbach/pte/dto/Connection.java index 35de3fa1..75ec5a30 100644 --- a/src/de/schildbach/pte/dto/Connection.java +++ b/src/de/schildbach/pte/dto/Connection.java @@ -32,7 +32,6 @@ public final class Connection implements Serializable public final Date departureTime; public final Date arrivalTime; public final String line; - public final int[] lineColors; public final int fromId; public final String from; public final int toId; @@ -40,16 +39,14 @@ public final class Connection implements Serializable public final List parts; public final List fares; - public Connection(final String id, final String link, final Date departureTime, final Date arrivalTime, final String line, - final int[] lineColors, final int fromId, final String from, final int toId, final String to, final List parts, - final List fares) + public Connection(final String id, final String link, final Date departureTime, final Date arrivalTime, final String line, final int fromId, + final String from, final int toId, final String to, final List parts, final List fares) { this.id = id; this.link = link; this.departureTime = departureTime; this.arrivalTime = arrivalTime; this.line = line; - this.lineColors = lineColors; this.fromId = fromId; this.from = from; this.toId = toId; @@ -89,7 +86,6 @@ public final class Connection implements Serializable public final static class Trip implements Part { public final String line; - public final int[] lineColors; public final Location destination; public final Date departureTime; public final String departurePosition; @@ -101,12 +97,11 @@ public final class Connection implements Serializable public final String arrival; public final List intermediateStops; - public Trip(final String line, final int[] lineColors, final Location destination, final Date departureTime, final String departurePosition, - final int departureId, final String departure, final Date arrivalTime, final String arrivalPosition, final int arrivalId, - final String arrival, final List intermediateStops) + public Trip(final String line, final Location destination, final Date departureTime, final String departurePosition, final int departureId, + final String departure, final Date arrivalTime, final String arrivalPosition, final int arrivalId, final String arrival, + final List intermediateStops) { this.line = line; - this.lineColors = lineColors; this.destination = destination; this.departureTime = departureTime; this.departurePosition = departurePosition;