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

Migrate time zone from abstract method to simple property.

Browse source
This commit is contained in:
Andreas Schildbach 2014-07-14 22:37:29 +02:00
parent bff85b9f6c
commit e691e7c2fb
16 changed files with 52 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

24
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -37,7 +37,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -229,11 +228,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.fareCorrectionFactor = fareCorrectionFactor;
}
protected TimeZone timeZone()
{
return TimeZone.getTimeZone("Europe/Berlin");
}
private final void appendCommonRequestParams(final StringBuilder uri, final String outputFormat)
{
uri.append("?outputFormat=").append(outputFormat);
@ -1549,8 +1543,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
if (XmlPullUtil.test(pp, "itdMessage"))
XmlPullUtil.next(pp);
final Calendar plannedDepartureTime = new GregorianCalendar(timeZone());
final Calendar predictedDepartureTime = new GregorianCalendar(timeZone());
final Calendar plannedDepartureTime = new GregorianCalendar(timeZone);
final Calendar predictedDepartureTime = new GregorianCalendar(timeZone);
XmlPullUtil.require(pp, "itdServingLines");
if (!pp.isEmptyElementTag())
@ -1716,8 +1710,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
{
XmlPullUtil.enter(pp, "dps");
final Calendar plannedDepartureTime = new GregorianCalendar(timeZone());
final Calendar predictedDepartureTime = new GregorianCalendar(timeZone());
final Calendar plannedDepartureTime = new GregorianCalendar(timeZone);
final Calendar predictedDepartureTime = new GregorianCalendar(timeZone);
while (XmlPullUtil.test(pp, "dp"))
{
@ -2440,7 +2434,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
{
XmlPullUtil.enter(pp, "itdRouteList");
final Calendar time = new GregorianCalendar(timeZone());
final Calendar time = new GregorianCalendar(timeZone);
while (XmlPullUtil.test(pp, "itdRoute"))
{
@ -2859,8 +2853,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
pp.setInput(is, null);
final ResultHeader header = enterEfa(pp);
final Calendar plannedTime = new GregorianCalendar(timeZone());
final Calendar predictedTime = new GregorianCalendar(timeZone());
final Calendar plannedTime = new GregorianCalendar(timeZone);
final Calendar predictedTime = new GregorianCalendar(timeZone);
final List<Trip> trips = new ArrayList<Trip>();
@ -3330,7 +3324,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
final String now = XmlPullUtil.attr(pp, "now");
final String sessionId = XmlPullUtil.attr(pp, "sessionID");
final Calendar serverTime = new GregorianCalendar(timeZone());
final Calendar serverTime = new GregorianCalendar(timeZone);
ParserUtils.parseIsoDate(serverTime, now.substring(0, 10));
ParserUtils.parseEuropeanTime(serverTime, now.substring(11));
@ -3366,7 +3360,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
XmlPullUtil.enter(pp, "efa");
final String now = XmlPullUtil.valueTag(pp, "now");
final Calendar serverTime = new GregorianCalendar(timeZone());
final Calendar serverTime = new GregorianCalendar(timeZone);
ParserUtils.parseIsoDate(serverTime, now.substring(0, 10));
ParserUtils.parseEuropeanTime(serverTime, now.substring(11));