From c6815f3f217f2d12c8746e70d98bd9e6b0dd7614 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Sun, 16 Jan 2011 13:01:24 +0000 Subject: [PATCH] get rid of unused line in connection top-level DTO git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@457 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/AbstractEfaProvider.java | 4 ++-- src/de/schildbach/pte/AbstractHafasProvider.java | 4 ++-- src/de/schildbach/pte/BahnProvider.java | 9 ++------- src/de/schildbach/pte/BvgProvider.java | 8 ++++---- src/de/schildbach/pte/OebbProvider.java | 4 ++-- src/de/schildbach/pte/RmvProvider.java | 15 +++++---------- src/de/schildbach/pte/dto/Connection.java | 6 ++---- 7 files changed, 19 insertions(+), 31 deletions(-) diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java index e1b69462..ef997a65 100644 --- a/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/src/de/schildbach/pte/AbstractEfaProvider.java @@ -1330,8 +1330,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider } XmlPullUtil.exit(pp, "itdFare"); } - connections.add(new Connection(id, uri, firstDepartureTime, lastArrivalTime, null, 0, firstDeparture, 0, lastArrival, parts, - fares.isEmpty() ? null : fares)); + connections.add(new Connection(id, uri, firstDepartureTime, lastArrivalTime, 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 25e6de6b..ab03c868 100644 --- a/src/de/schildbach/pte/AbstractHafasProvider.java +++ b/src/de/schildbach/pte/AbstractHafasProvider.java @@ -450,8 +450,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider XmlPullUtil.exit(pp); - connections.add(new Connection(id, null, firstDepartureTime, lastArrivalTime, null, departure.id, departure.name, arrival.id, - arrival.name, parts, null)); + connections.add(new Connection(id, null, firstDepartureTime, lastArrivalTime, departure.id, departure.name, arrival.id, arrival.name, + parts, null)); } XmlPullUtil.exit(pp); diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index 31672956..8ac46e3a 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -266,13 +266,8 @@ public final class BahnProvider extends AbstractHafasProvider Date arrivalTime = ParserUtils.joinDateTime(currentDate, ParserUtils.parseTime(mConFine.group(3))); if (departureTime.after(arrivalTime)) arrivalTime = ParserUtils.addDays(arrivalTime, 1); - String line = ParserUtils.resolveEntities(mConFine.group(4)); - if (line != null && !line.contains(",")) - line = normalizeLine(line); - else - line = null; final Connection connection = new Connection(AbstractHafasProvider.extractConnectionId(link), link, departureTime, arrivalTime, - line, 0, from.name, 0, to.name, null, null); + 0, from.name, 0, to.name, null, null); connections.add(connection); } else @@ -420,7 +415,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, 0, firstDeparture, 0, lastArrival, parts, null)); + lastArrivalTime, 0, firstDeparture, 0, lastArrival, parts, null)); } else { diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java index c22b291c..b2edba4e 100644 --- a/src/de/schildbach/pte/BvgProvider.java +++ b/src/de/schildbach/pte/BvgProvider.java @@ -341,7 +341,8 @@ public final class BvgProvider extends AbstractHafasProvider private static final Pattern P_CONNECTIONS_COARSE = Pattern.compile("

(.+?)

", Pattern.DOTALL); private static final Pattern P_CONNECTIONS_FINE = Pattern.compile(".*?" // + "" // link - + "(\\d\\d:\\d\\d)-(\\d\\d:\\d\\d)  (?:\\d+ Umst\\.|([\\w\\d ]+)).*?" // + + "(\\d\\d:\\d\\d)-(\\d\\d:\\d\\d)  " // departureTime, arrivalTime + + "(?:\\d+ Umst\\.|([\\w\\d ]+)).*?" // line , Pattern.DOTALL); private QueryConnectionsResult queryConnections(final String uri, final CharSequence page) throws IOException @@ -390,9 +391,8 @@ public final class BvgProvider extends AbstractHafasProvider Date arrivalTime = ParserUtils.joinDateTime(currentDate, ParserUtils.parseTime(mConFine.group(3))); if (departureTime.after(arrivalTime)) 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, 0, from.name, 0, to.name, null, null); + 0, from.name, 0, to.name, null, null); connections.add(connection); } else @@ -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, firstDepartureId, firstDeparture, lastArrivalId, lastArrival, parts, null)); + firstDepartureTime, lastArrivalTime, 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 b870e77a..a81a406d 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -409,8 +409,8 @@ 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, 0, from.name, 0, - to.name, new ArrayList(1), null); + final Connection connection = new Connection(id, link, overviewDepartureTime, overviewArrivalTime, 0, from.name, 0, to.name, + new ArrayList(1), null); connections.add(connection); final Matcher mDetCoarse = P_CONNECTION_DETAILS_COARSE.matcher(details); diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java index 0909b729..8fc60318 100644 --- a/src/de/schildbach/pte/RmvProvider.java +++ b/src/de/schildbach/pte/RmvProvider.java @@ -228,8 +228,8 @@ public class RmvProvider extends AbstractHafasProvider private static final Pattern P_CONNECTIONS_COARSE = Pattern.compile("

(.+?)

", Pattern.DOTALL); private static final Pattern P_CONNECTIONS_FINE = Pattern.compile(".*?" // + "" // link - + "(\\d+:\\d+)-(\\d+:\\d+)" // - + "(?: (.+?))?" // + + "(\\d+:\\d+)-(\\d+:\\d+)" // departureTime, arrivalTime + + "(?: (.+?))?" // line , Pattern.DOTALL); @Override @@ -271,12 +271,7 @@ public class RmvProvider extends AbstractHafasProvider Date arrivalTime = ParserUtils.joinDateTime(currentDate, ParserUtils.parseTime(mConFine.group(3))); if (departureTime.after(arrivalTime)) arrivalTime = ParserUtils.addDays(arrivalTime, 1); - String line = mConFine.group(4); - if (line != null && !line.endsWith("Um.")) - line = normalizeLine(line); - else - line = null; - final Connection connection = new Connection(extractConnectionId(link), link, departureTime, arrivalTime, line, 0, from.name, 0, + final Connection connection = new Connection(extractConnectionId(link), link, departureTime, arrivalTime, 0, from.name, 0, to.name, null, null); connections.add(connection); } @@ -390,8 +385,8 @@ public class RmvProvider extends AbstractHafasProvider } } - return new GetConnectionDetailsResult(currentDate, new Connection(extractConnectionId(uri), uri, firstDepartureTime, lastArrivalTime, - null, 0, firstDeparture, 0, lastArrival, parts, null)); + return new GetConnectionDetailsResult(currentDate, new Connection(extractConnectionId(uri), uri, firstDepartureTime, lastArrivalTime, 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 75ec5a30..3b94788a 100644 --- a/src/de/schildbach/pte/dto/Connection.java +++ b/src/de/schildbach/pte/dto/Connection.java @@ -31,7 +31,6 @@ public final class Connection implements Serializable public final String link; public final Date departureTime; public final Date arrivalTime; - public final String line; public final int fromId; public final String from; public final int toId; @@ -39,14 +38,13 @@ 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 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 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.fromId = fromId; this.from = from; this.toId = toId;