From bf510b516ddd4300d771b95ccd3f2a5d3abcb35c Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 28 Jan 2017 12:16:49 +0100 Subject: [PATCH] If possible, use generic type inference for constructing objects. --- .../schildbach/pte/AbstractEfaProvider.java | 64 +++++++++---------- .../pte/AbstractHafasLegacyProvider.java | 34 +++++----- .../pte/AbstractHafasMobileProvider.java | 18 +++--- .../pte/AbstractNavitiaProvider.java | 12 ++-- .../schildbach/pte/AbstractTsiProvider.java | 16 ++--- .../src/de/schildbach/pte/AvvProvider.java | 2 +- .../src/de/schildbach/pte/BsvagProvider.java | 2 +- .../src/de/schildbach/pte/BvgProvider.java | 2 +- .../src/de/schildbach/pte/GvhProvider.java | 2 +- .../src/de/schildbach/pte/HslProvider.java | 32 +++++----- .../src/de/schildbach/pte/InvgProvider.java | 4 +- .../src/de/schildbach/pte/KvvProvider.java | 2 +- .../src/de/schildbach/pte/LinzProvider.java | 2 +- .../src/de/schildbach/pte/MvvProvider.java | 2 +- .../src/de/schildbach/pte/SeptaProvider.java | 2 +- enabler/src/de/schildbach/pte/ShProvider.java | 2 +- enabler/src/de/schildbach/pte/Standard.java | 2 +- .../src/de/schildbach/pte/SvvProvider.java | 2 +- .../src/de/schildbach/pte/SydneyProvider.java | 2 +- .../src/de/schildbach/pte/TlemProvider.java | 2 +- .../src/de/schildbach/pte/VagfrProvider.java | 2 +- .../src/de/schildbach/pte/VaoProvider.java | 2 +- .../src/de/schildbach/pte/VbnProvider.java | 2 +- .../src/de/schildbach/pte/VorProvider.java | 2 +- .../src/de/schildbach/pte/VrnProvider.java | 2 +- .../src/de/schildbach/pte/VrrProvider.java | 2 +- .../src/de/schildbach/pte/VrsProvider.java | 22 +++---- .../src/de/schildbach/pte/WienProvider.java | 2 +- .../src/de/schildbach/pte/ZvvProvider.java | 2 +- .../pte/dto/QueryDeparturesResult.java | 2 +- .../pte/dto/SuggestLocationsResult.java | 4 +- .../de/schildbach/pte/util/HttpClient.java | 2 +- .../pte/live/VrsProviderLiveTest.java | 4 +- 33 files changed, 128 insertions(+), 128 deletions(-) diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index 3d72822e..09f604ec 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -256,7 +256,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT); try { - final List locations = new ArrayList(); + final List locations = new ArrayList<>(); final JSONObject head = new JSONObject(page.toString()); final JSONObject stopFinder = head.optJSONObject("stopFinder"); @@ -358,7 +358,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { protected SuggestLocationsResult xmlStopfinderRequest(final Location constraint) throws IOException { final HttpUrl.Builder url = stopFinderEndpoint.newBuilder(); appendStopfinderRequestParameters(url, constraint, "XML"); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -368,7 +368,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { pp.setInput(body.byteStream(), null); // Read encoding from XML declaration final ResultHeader header = enterItdRequest(pp); - final List locations = new ArrayList(); + final List locations = new ArrayList<>(); XmlPullUtil.enter(pp, "itdStopFinderRequest"); @@ -400,7 +400,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { protected SuggestLocationsResult mobileStopfinderRequest(final Location constraint) throws IOException { final HttpUrl.Builder url = stopFinderEndpoint.newBuilder(); appendStopfinderRequestParameters(url, constraint, "XML"); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -410,7 +410,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { pp.setInput(body.byteStream(), null); // Read encoding from XML declaration final ResultHeader header = enterEfa(pp); - final List locations = new ArrayList(); + final List locations = new ArrayList<>(); XmlPullUtil.require(pp, "sf"); if (!pp.isEmptyElementTag()) { @@ -510,7 +510,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { final int maxDistance, final int maxStations) throws IOException { final HttpUrl.Builder url = coordEndpoint.newBuilder(); appendXmlCoordRequestParameters(url, types, lat, lon, maxDistance, maxStations); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -527,7 +527,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { XmlPullUtil.enter(pp, "coordInfoRequest"); XmlPullUtil.skipExit(pp, "coordInfoRequest"); - final List locations = new ArrayList(); + final List locations = new ArrayList<>(); if (XmlPullUtil.test(pp, "coordInfoItemList")) { XmlPullUtil.enter(pp, "coordInfoItemList"); @@ -584,7 +584,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { final int maxDistance, final int maxStations) throws IOException { final HttpUrl.Builder url = coordEndpoint.newBuilder(); appendXmlCoordRequestParameters(url, types, lat, lon, maxDistance, maxStations); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -599,7 +599,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { XmlPullUtil.enter(pp, "request"); XmlPullUtil.skipExit(pp, "request"); - final List stations = new ArrayList(); + final List stations = new ArrayList<>(); if (XmlPullUtil.test(pp, "pis")) { XmlPullUtil.enter(pp, "pis"); @@ -861,7 +861,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { url.addEncodedQueryParameter("mergeDep", "1"); url.addEncodedQueryParameter("useAllStops", "1"); url.addEncodedQueryParameter("mode", "direct"); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -873,8 +873,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { XmlPullUtil.enter(pp, "itdDepartureMonitorRequest"); - final AtomicReference ownStation = new AtomicReference(); - final List stations = new ArrayList(); + final AtomicReference ownStation = new AtomicReference<>(); + final List stations = new ArrayList<>(); final String nameState = processItdOdv(pp, "dm", new ProcessItdOdvCallback() { @Override @@ -1454,7 +1454,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { final int maxDepartures, final boolean equivs) throws IOException { final HttpUrl.Builder url = departureMonitorEndpoint.newBuilder(); appendXsltDepartureMonitorRequestParameters(url, stationId, time, maxDepartures, equivs); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -1628,7 +1628,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { final int maxDepartures, final boolean equivs) throws IOException { final HttpUrl.Builder url = departureMonitorEndpoint.newBuilder(); appendXsltDepartureMonitorRequestParameters(url, stationId, time, maxDepartures, equivs); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -2058,7 +2058,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { final HttpUrl.Builder url = tripEndpoint.newBuilder(); appendXsltTripRequestParameters(url, from, via, to, date, dep, products, optimize, walkSpeed, accessibility, options); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -2089,7 +2089,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { final HttpUrl.Builder url = tripEndpoint.newBuilder(); appendXsltTripRequestParameters(url, from, via, to, date, dep, products, optimize, walkSpeed, accessibility, options); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -2119,7 +2119,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { final HttpUrl commandUrl = HttpUrl.parse(context.context); final HttpUrl.Builder url = commandUrl.newBuilder(); url.addEncodedQueryParameter("command", later ? "tripNext" : "tripPrev"); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -2145,7 +2145,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { final HttpUrl commandUrl = HttpUrl.parse(context.context); final HttpUrl.Builder url = commandUrl.newBuilder(); url.addEncodedQueryParameter("command", later ? "tripNext" : "tripPrev"); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -2191,7 +2191,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { while (XmlPullUtil.test(pp, "itdOdv")) { final String usage = XmlPullUtil.attr(pp, "usage"); - final List locations = new ArrayList(); + final List locations = new ArrayList<>(); final String nameState = processItdOdv(pp, usage, new ProcessItdOdvCallback() { @Override public void location(final String nameState, final Location location, final int matchQuality) { @@ -2256,7 +2256,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { XmlPullUtil.requireSkip(pp, "itdTripOptions"); XmlPullUtil.optSkipMultiple(pp, "omcTaxi"); - final List trips = new ArrayList(); + final List trips = new ArrayList<>(); XmlPullUtil.require(pp, "itdItinerary"); if (!pp.isEmptyElementTag()) { @@ -2288,7 +2288,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { XmlPullUtil.optSkip(pp, "itdMapItemList"); XmlPullUtil.enter(pp, "itdPartialRouteList"); - final List legs = new LinkedList(); + final List legs = new LinkedList<>(); Location firstDepartureLocation = null; Location lastArrivalLocation = null; @@ -2381,7 +2381,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { XmlPullUtil.skipExit(pp, "itdPartialRouteList"); - final List fares = new ArrayList(2); + final List fares = new ArrayList<>(2); if (XmlPullUtil.test(pp, "itdFare")) { if (!pp.isEmptyElementTag()) { XmlPullUtil.enter(pp, "itdFare"); @@ -2565,7 +2565,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { List intermediateStops = null; if (XmlPullUtil.test(pp, "itdStopSeq")) { XmlPullUtil.enter(pp, "itdStopSeq"); - intermediateStops = new LinkedList(); + intermediateStops = new LinkedList<>(); while (XmlPullUtil.test(pp, "itdPoint")) { final Location stopLocation = processItdPointAttributes(pp); @@ -2657,7 +2657,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { XmlPullUtil.skipExit(pp, "nextDeps"); } - final Set lineAttrs = new HashSet(); + final Set lineAttrs = new HashSet<>(); if (wheelChairAccess || lowFloorVehicle) lineAttrs.add(Line.Attr.WHEEL_CHAIR_ACCESS); final Line styledLine = new Line(line.id, line.network, line.product, line.label, @@ -2684,7 +2684,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { final Calendar plannedTimeCal = new GregorianCalendar(timeZone); final Calendar predictedTimeCal = new GregorianCalendar(timeZone); - final List trips = new ArrayList(); + final List trips = new ArrayList<>(); if (XmlPullUtil.test(pp, "ts")) { if (!pp.isEmptyElementTag()) { @@ -2704,7 +2704,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { XmlPullUtil.enter(pp, "ls"); - final List legs = new LinkedList(); + final List legs = new LinkedList<>(); Location firstDepartureLocation = null; Location lastArrivalLocation = null; @@ -2784,7 +2784,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { if (!pp.isEmptyElementTag()) { XmlPullUtil.enter(pp, "pss"); - intermediateStops = new LinkedList(); + intermediateStops = new LinkedList<>(); while (XmlPullUtil.test(pp, "s")) { plannedTimeCal.clear(); @@ -2877,7 +2877,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { if (!pp.isEmptyElementTag()) { XmlPullUtil.enter(pp, "tcs"); - fares = new ArrayList(2); + fares = new ArrayList<>(2); XmlPullUtil.optSkipMultiple(pp, "tc"); // TODO fares XmlPullUtil.skipExit(pp, "tcs"); } else { @@ -2937,7 +2937,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { private List processCoordinateStrings(final XmlPullParser pp, final String tag) throws XmlPullParserException, IOException { - final List path = new LinkedList(); + final List path = new LinkedList<>(); final String value = XmlPullUtil.valueTag(pp, tag); for (final String coordStr : value.split(" +")) @@ -2947,7 +2947,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { } private List processCoordinateBaseElems(final XmlPullParser pp) throws XmlPullParserException, IOException { - final List path = new LinkedList(); + final List path = new LinkedList<>(); XmlPullUtil.enter(pp, "itdCoordinateBaseElemList"); @@ -3090,7 +3090,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { return location.name; } - private static final Map WALKSPEED_MAP = new HashMap(); + private static final Map WALKSPEED_MAP = new HashMap<>(); static { WALKSPEED_MAP.put(WalkSpeed.SLOW, "slow"); @@ -3170,7 +3170,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider { } private Map processPas(final XmlPullParser pp) throws XmlPullParserException, IOException { - final Map params = new HashMap(); + final Map params = new HashMap<>(); XmlPullUtil.enter(pp, "pas"); diff --git a/enabler/src/de/schildbach/pte/AbstractHafasLegacyProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasLegacyProvider.java index 33724673..41d8f182 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasLegacyProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasLegacyProvider.java @@ -321,7 +321,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider final Matcher mJson = P_AJAX_GET_STOPS_JSON.matcher(page); if (mJson.matches()) { final String json = mJson.group(1); - final List locations = new ArrayList(); + final List locations = new ArrayList<>(); try { final JSONObject head = new JSONObject(json); @@ -436,7 +436,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider protected final QueryDeparturesResult xmlStationBoard(final HttpUrl url, final String stationId) throws IOException { final String normalizedStationId = normalizeStationId(stationId); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); httpClient.getInputStream(new HttpClient.Callback() { @@ -783,7 +783,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider final String request = wrapReqC(conReq, null); final HttpUrl endpoint = extXmlEndpoint != null ? extXmlEndpoint : queryEndpoint.newBuilder().addPathSegment(apiLanguage).build(); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); httpClient.getInputStream(new HttpClient.Callback() { @Override public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { @@ -917,7 +917,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider XmlPullUtil.enter(pp, "ConnectionList"); - final List trips = new ArrayList(); + final List trips = new ArrayList<>(); while (XmlPullUtil.test(pp, "Connection")) { final String id = context.sequence + "/" + XmlPullUtil.attr(pp, "id"); @@ -969,7 +969,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider XmlPullUtil.skipExit(pp, "Overview"); - final List legs = new ArrayList(4); + final List legs = new ArrayList<>(4); XmlPullUtil.enter(pp, "ConSectionList"); @@ -1040,7 +1040,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider XmlPullUtil.skipExit(pp, "JourneyAttributeList"); if (XmlPullUtil.test(pp, "PassList")) { - intermediateStops = new LinkedList(); + intermediateStops = new LinkedList<>(); XmlPullUtil.enter(pp, "PassList"); while (XmlPullUtil.test(pp, "BasicStop")) { @@ -1101,7 +1101,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider // polyline final List path; if (XmlPullUtil.test(pp, "Polyline")) { - path = new LinkedList(); + path = new LinkedList<>(); XmlPullUtil.enter(pp, "Polyline"); while (XmlPullUtil.test(pp, "Point")) { final int x = XmlPullUtil.intAttr(pp, "x"); @@ -1196,7 +1196,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider private final Map parseAttributeVariants(final XmlPullParser pp) throws XmlPullParserException, IOException { - final Map attributeVariants = new HashMap(); + final Map attributeVariants = new HashMap<>(); while (XmlPullUtil.test(pp, "AttributeVariant")) { final String type = XmlPullUtil.attr(pp, "type"); @@ -1418,7 +1418,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider * Many thanks to Malte Starostik and Robert, who helped a lot with analyzing this API! */ - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); httpClient.getInputStream(new HttpClient.Callback() { @Override @@ -1552,7 +1552,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider final CommentTable comments = new CommentTable(is, commentTablePtr, tripDetailsPtr - commentTablePtr, strings); - final List trips = new ArrayList(numTrips); + final List trips = new ArrayList<>(numTrips); // read trips for (int iTrip = 0; iTrip < numTrips; iTrip++) { @@ -1628,7 +1628,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider } } - final List legs = new ArrayList(numLegs); + final List legs = new ArrayList<>(numLegs); for (int iLegs = 0; iLegs < numLegs; iLegs++) { is.reset(); @@ -1649,7 +1649,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider final int legAttrIndex = is.readShortReverse(); - final List lineAttrs = new ArrayList(); + final List lineAttrs = new ArrayList<>(); String lineComment = null; boolean lineOnDemand = false; for (final String comment : comments.read(is)) { @@ -1780,7 +1780,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider if (stopsSize != 26) throw new IllegalStateException("unhandled stops size: " + stopsSize); - intermediateStops = new ArrayList(numStops); + intermediateStops = new ArrayList<>(numStops); for (int iStop = 0; iStop < numStops; iStop++) { final long plannedStopDepartureTime = time(is, resDate, tripDayOffset); @@ -2242,7 +2242,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider // scrape page final CharSequence page = httpClient.get(url); - final List stations = new ArrayList(); + final List stations = new ArrayList<>(); // parse page final Matcher mMessage = P_XML_NEARBY_STATIONS_MESSAGES.matcher(page); @@ -2322,7 +2322,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider final JSONObject head = new JSONObject(page.toString()); final int error = head.getInt("error"); if (error == 0) { - final List locations = new LinkedList(); + final List locations = new LinkedList<>(); final JSONArray aStops = head.optJSONArray("stops"); if (aStops != null) { @@ -2396,7 +2396,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider .compile("(Ihre Eingabe kann nicht interpretiert werden)"); protected final NearbyLocationsResult htmlNearbyStations(final HttpUrl url) throws IOException { - final List stations = new ArrayList(); + final List stations = new ArrayList<>(); final CharSequence page = httpClient.get(url); String oldZebra = null; @@ -3034,7 +3034,7 @@ public abstract class AbstractHafasLegacyProvider extends AbstractHafasProvider return new Line(null, network, product, normalizedName, lineStyle(network, product, normalizedName), comment); } else { - final Set attrSet = new HashSet(); + final Set attrSet = new HashSet<>(); for (final Line.Attr attr : attrs) attrSet.add(attr); return new Line(null, network, product, normalizedName, lineStyle(network, product, normalizedName), diff --git a/enabler/src/de/schildbach/pte/AbstractHafasMobileProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasMobileProvider.java index 8347a698..4a96d90c 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasMobileProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasMobileProvider.java @@ -334,7 +334,7 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider final JSONObject match = res.getJSONObject("match"); final List locations = parseLocList(match.optJSONArray("locL")); - final List suggestedLocations = new ArrayList(locations.size()); + final List suggestedLocations = new ArrayList<>(locations.size()); for (final Location location : locations) suggestedLocations.add(new SuggestedLocation(location)); // TODO weight @@ -444,7 +444,7 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider final List lines = parseProdList(common.getJSONArray("prodL"), operators); final JSONArray outConList = res.optJSONArray("outConL"); - final List trips = new ArrayList(outConList.length()); + final List trips = new ArrayList<>(outConList.length()); for (int iOutCon = 0; iOutCon < outConList.length(); iOutCon++) { final JSONObject outCon = outConList.getJSONObject(iOutCon); final Location tripFrom = locations.get(outCon.getJSONObject("dep").getInt("locX")); @@ -455,7 +455,7 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider final Date baseDate = c.getTime(); final JSONArray secList = outCon.optJSONArray("secL"); - final List legs = new ArrayList(secList.length()); + final List legs = new ArrayList<>(secList.length()); for (int iSec = 0; iSec < secList.length(); iSec++) { final JSONObject sec = secList.getJSONObject(iSec); final String secType = sec.getString("type"); @@ -476,7 +476,7 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider final JSONArray stopList = jny.getJSONArray("stopL"); checkState(stopList.length() >= 2); - final List intermediateStops = new ArrayList(stopList.length()); + final List intermediateStops = new ArrayList<>(stopList.length()); for (int iStop = 1; iStop < stopList.length() - 1; iStop++) { final JSONObject stop = stopList.getJSONObject(iStop); final Stop intermediateStop = parseJsonStop(stop, locations, c, baseDate); @@ -499,7 +499,7 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider } final JSONObject trfRes = outCon.optJSONObject("trfRes"); - final List fares = new LinkedList(); + final List fares = new LinkedList<>(); if (trfRes != null) { final JSONArray fareSetList = trfRes.getJSONArray("fareSetL"); for (int iFareSet = 0; iFareSet < fareSetList.length(); iFareSet++) { @@ -636,7 +636,7 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider } private List parseRemList(final JSONArray remList) throws JSONException { - final List remarks = new ArrayList(remList.length()); + final List remarks = new ArrayList<>(remList.length()); for (int i = 0; i < remList.length(); i++) { final JSONObject rem = remList.getJSONObject(i); @@ -649,7 +649,7 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider } private List parseLocList(final JSONArray locList) throws JSONException { - final List locations = new ArrayList(locList.length()); + final List locations = new ArrayList<>(locList.length()); for (int iLoc = 0; iLoc < locList.length(); iLoc++) { final JSONObject loc = locList.getJSONObject(iLoc); @@ -691,7 +691,7 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider } private List parseOpList(final JSONArray opList) throws JSONException { - final List operators = new ArrayList(opList.length()); + final List operators = new ArrayList<>(opList.length()); for (int i = 0; i < opList.length(); i++) { final JSONObject op = opList.getJSONObject(i); @@ -703,7 +703,7 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider } private List parseProdList(final JSONArray prodList, final List operators) throws JSONException { - final List lines = new ArrayList(prodList.length()); + final List lines = new ArrayList<>(prodList.length()); for (int iProd = 0; iProd < prodList.length(); iProd++) { final JSONObject prod = prodList.getJSONObject(iProd); diff --git a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java index 33849043..6f2f66ee 100644 --- a/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java @@ -304,7 +304,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider { } private LinkedList parsePath(final JSONArray coordinates) throws IOException { - LinkedList path = new LinkedList(); + LinkedList path = new LinkedList<>(); for (int i = 0; i < coordinates.length(); ++i) { try { @@ -494,7 +494,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider { final Stop arrivalStop = parseStop(stopDateTimes.getJSONObject(nbStopDateTime - 1)); // Build intermediate stops. - final LinkedList intermediateStops = new LinkedList(); + final LinkedList intermediateStops = new LinkedList<>(); for (int i = 1; i < nbStopDateTime - 1; ++i) { final Stop intermediateStop = parseStop(stopDateTimes.getJSONObject(i)); intermediateStops.add(intermediateStop); @@ -555,7 +555,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider { final int changeCount = journey.getInt("nb_transfers"); // Build leg list. - final List legs = new LinkedList(); + final List legs = new LinkedList<>(); final JSONArray sections = journey.getJSONArray("sections"); for (int j = 0; j < sections.length(); ++j) { @@ -707,7 +707,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider { if (nbResults == 0) { return new NearbyLocationsResult(resultHeader, Status.INVALID_ID); } else { - final List stations = new ArrayList(); + final List stations = new ArrayList<>(); final JSONArray places = head.getJSONArray("places_nearby"); @@ -837,7 +837,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider { final CharSequence page = httpClient.get(url.build()); try { - final List locations = new ArrayList(); + final List locations = new ArrayList<>(); final JSONObject head = new JSONObject(page.toString()); @@ -1086,7 +1086,7 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider { final String shape = regionInfo.getString("shape"); // Parse string using JSON tokenizer for coordinates. - List pointList = new ArrayList(); + List pointList = new ArrayList<>(); final JSONTokener shapeTokener = new JSONTokener(shape); shapeTokener.skipTo('('); shapeTokener.next(); diff --git a/enabler/src/de/schildbach/pte/AbstractTsiProvider.java b/enabler/src/de/schildbach/pte/AbstractTsiProvider.java index 0edf8d08..f81bf547 100644 --- a/enabler/src/de/schildbach/pte/AbstractTsiProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractTsiProvider.java @@ -123,7 +123,7 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider { private static final String DEFAULT_TRIP_ENDPOINT = "journeyplanner/v2"; private static final String SERVER_PRODUCT = "tsi"; - private static Map TRANSPORT_MODES = new HashMap(); + private static Map TRANSPORT_MODES = new HashMap<>(); static { // HIGH_SPEED_TRAIN TRANSPORT_MODES.put("TGV", Product.HIGH_SPEED_TRAIN); @@ -200,7 +200,7 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider { final CharSequence page = httpClient.get(url.build()); try { - final List locations = new ArrayList(); + final List locations = new ArrayList<>(); final JSONObject head = new JSONObject(page.toString()); final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT); @@ -258,7 +258,7 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider { final List locations = suggestLocations(location.uniqueShortName()).getLocations(); if (locations == null) - return new ArrayList(0); + return new ArrayList<>(0); return locations; } @@ -275,7 +275,7 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider { final CharSequence page = httpClient.get(url.build()); try { - final List stations = new ArrayList(); + final List stations = new ArrayList<>(); final JSONObject head = new JSONObject(page.toString()); final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT); @@ -352,7 +352,7 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider { } final JSONArray pathLinks = legInfo.getJSONObject("pathLinks").getJSONArray("PathLink"); - final List path = new ArrayList(pathLinks.length() + 1); + final List path = new ArrayList<>(pathLinks.length() + 1); int distance = 0; path.add(new Point(departure.lat, departure.lon)); @@ -440,7 +440,7 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider { } final JSONArray stepArray = ptrInfo.getJSONObject("steps").getJSONArray("Step"); - List intermediateStops = new ArrayList(stepArray.length() - 1); + List intermediateStops = new ArrayList<>(stepArray.length() - 1); for (int i = 0; i < stepArray.length() - 1; i++) { final JSONObject enterStop = stepArray.getJSONObject(i).getJSONObject("Arrival"); final JSONObject leaveStop = stepArray.getJSONObject(i + 1).getJSONObject("Departure"); @@ -469,7 +469,7 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider { final Location to = parseJsonJourneyplannerLocation(arrivalInfo.getJSONObject("Site")); final JSONArray legArray = tripObject.getJSONObject("sections").getJSONArray("Section"); - final List legs = new ArrayList(legArray.length()); + final List legs = new ArrayList<>(legArray.length()); for (int i = 0; i < legArray.length(); i++) { legs.add(parseJsonJourneyplannerLeg(legArray.getJSONObject(i))); @@ -688,7 +688,7 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider { } final JSONArray tripArray = head.getJSONObject("trips").getJSONArray("Trip"); - final List trips = new ArrayList(tripArray.length()); + final List trips = new ArrayList<>(tripArray.length()); for (int i = 0; i < tripArray.length(); i++) { final JSONObject tripObject = tripArray.getJSONObject(i); diff --git a/enabler/src/de/schildbach/pte/AvvProvider.java b/enabler/src/de/schildbach/pte/AvvProvider.java index 20ee1874..8c11f546 100644 --- a/enabler/src/de/schildbach/pte/AvvProvider.java +++ b/enabler/src/de/schildbach/pte/AvvProvider.java @@ -87,7 +87,7 @@ public class AvvProvider extends AbstractEfaProvider { return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { STYLES.put("B", new Style(Style.Shape.CIRCLE, Style.parseColor("#abb1b1"), Style.BLACK)); diff --git a/enabler/src/de/schildbach/pte/BsvagProvider.java b/enabler/src/de/schildbach/pte/BsvagProvider.java index afc75beb..db93cd1f 100644 --- a/enabler/src/de/schildbach/pte/BsvagProvider.java +++ b/enabler/src/de/schildbach/pte/BsvagProvider.java @@ -59,7 +59,7 @@ public class BsvagProvider extends AbstractEfaProvider { url.addEncodedQueryParameter("inclMOT_11", "on"); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { // Braunschweig diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index 0d9ba2ef..782b942a 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/enabler/src/de/schildbach/pte/BvgProvider.java @@ -148,7 +148,7 @@ public final class BvgProvider extends AbstractHafasMobileProvider { return null; } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { STYLES.put("SS1", new Style(Style.rgb(221, 77, 174), Style.WHITE)); diff --git a/enabler/src/de/schildbach/pte/GvhProvider.java b/enabler/src/de/schildbach/pte/GvhProvider.java index 7442dced..345d974c 100644 --- a/enabler/src/de/schildbach/pte/GvhProvider.java +++ b/enabler/src/de/schildbach/pte/GvhProvider.java @@ -65,7 +65,7 @@ public class GvhProvider extends AbstractEfaProvider { return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { // Hannover diff --git a/enabler/src/de/schildbach/pte/HslProvider.java b/enabler/src/de/schildbach/pte/HslProvider.java index 1555104d..f74ce10b 100644 --- a/enabler/src/de/schildbach/pte/HslProvider.java +++ b/enabler/src/de/schildbach/pte/HslProvider.java @@ -141,7 +141,7 @@ public class HslProvider extends AbstractNetworkProvider { final HttpUrl.Builder url = apiUrl("stop"); url.addQueryParameter("code", stationId); url.addQueryParameter("dep_limit", "1"); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -184,7 +184,7 @@ public class HslProvider extends AbstractNetworkProvider { url.addQueryParameter("center_coordinate", locationToCoords(location)); url.addQueryParameter("limit", Integer.toString(maxStations)); url.addQueryParameter("diameter", Integer.toString(maxDistance * 2)); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -193,7 +193,7 @@ public class HslProvider extends AbstractNetworkProvider { final XmlPullParser pp = parserFactory.newPullParser(); pp.setInput(body.charStream()); - final List stations = new ArrayList(); + final List stations = new ArrayList<>(); final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT); XmlPullUtil.enter(pp, "response"); @@ -262,7 +262,7 @@ public class HslProvider extends AbstractNetworkProvider { url.addQueryParameter("time", new SimpleDateFormat("HHmm").format(queryDate)); } url.addQueryParameter("dep_limit", Integer.toString(maxDepartures)); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -278,7 +278,7 @@ public class HslProvider extends AbstractNetworkProvider { final String id = xmlValueTag(pp, "code"); final String name = xmlValueTag(pp, "name_fi"); - final Map lines = new HashMap(); + final Map lines = new HashMap<>(); XmlPullUtil.skipUntil(pp, "lines"); XmlPullUtil.enter(pp, "lines"); @@ -294,7 +294,7 @@ public class HslProvider extends AbstractNetworkProvider { XmlPullUtil.skipUntil(pp, "departures"); XmlPullUtil.enter(pp, "departures"); - final List departures = new ArrayList(maxDepartures); + final List departures = new ArrayList<>(maxDepartures); while (XmlPullUtil.test(pp, "node")) { XmlPullUtil.enter(pp, "node"); final String code = xmlValueTag(pp, "code"); @@ -341,14 +341,14 @@ public class HslProvider extends AbstractNetworkProvider { // name. String constraintStr = constraint.toString().replaceAll("[^\\p{Ll}\\p{Lu}\\p{Lt}\\p{Lo}\\p{Nd}\\d-'/ ]", ""); url.addQueryParameter("key", constraintStr); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { try { final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT); - final List locations = new ArrayList(); + final List locations = new ArrayList<>(); final XmlPullParser pp = parserFactory.newPullParser(); pp.setInput(body.charStream()); @@ -417,7 +417,7 @@ public class HslProvider extends AbstractNetworkProvider { this.via = via; this.to = to; this.date = date; - this.trips = new ArrayList(); + this.trips = new ArrayList<>(); } @Override @@ -480,7 +480,7 @@ public class HslProvider extends AbstractNetworkProvider { url.addQueryParameter("show", "5"); if (products != null && products.size() > 0) { - List tt = new ArrayList(); + List tt = new ArrayList<>(); if (products.contains(Product.HIGH_SPEED_TRAIN) || products.contains(Product.REGIONAL_TRAIN) || products.contains(Product.SUBURBAN_TRAIN)) tt.add("train"); @@ -550,7 +550,7 @@ public class HslProvider extends AbstractNetworkProvider { final HttpUrl.Builder url = HttpUrl.parse(context.uri).newBuilder(); url.addQueryParameter("date", new SimpleDateFormat("yyyyMMdd").format(date)); url.addQueryParameter("time", new SimpleDateFormat("HHmm").format(date)); - final AtomicReference result = new AtomicReference(); + final AtomicReference result = new AtomicReference<>(); final HttpClient.Callback callback = new HttpClient.Callback() { @Override @@ -563,10 +563,10 @@ public class HslProvider extends AbstractNetworkProvider { final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT); - final List trips = new ArrayList(context.trips); + final List trips = new ArrayList<>(context.trips); // we use this for quick checking if trip already exists - Set tripSet = new HashSet(); + Set tripSet = new HashSet<>(); for (Trip t : trips) tripSet.add(t.getId()); @@ -577,7 +577,7 @@ public class HslProvider extends AbstractNetworkProvider { XmlPullUtil.enter(pp, "node"); - List legs = new ArrayList(); + List legs = new ArrayList<>(); XmlPullUtil.skipUntil(pp, "legs"); XmlPullUtil.enter(pp, "legs"); @@ -590,7 +590,7 @@ public class HslProvider extends AbstractNetworkProvider { String legType = xmlValueTag(pp, "type"); String lineCode = XmlPullUtil.optValueTag(pp, "code", null); - List path = new ArrayList(); + List path = new ArrayList<>(); Location departure = null; Date departureTime = null; @@ -599,7 +599,7 @@ public class HslProvider extends AbstractNetworkProvider { Location arrival = null; Date arrivalTime = null; - LinkedList stops = new LinkedList(); + LinkedList stops = new LinkedList<>(); XmlPullUtil.skipUntil(pp, "locs"); XmlPullUtil.enter(pp, "locs"); diff --git a/enabler/src/de/schildbach/pte/InvgProvider.java b/enabler/src/de/schildbach/pte/InvgProvider.java index 94aaf96d..8ccdaf2c 100644 --- a/enabler/src/de/schildbach/pte/InvgProvider.java +++ b/enabler/src/de/schildbach/pte/InvgProvider.java @@ -196,7 +196,7 @@ public class InvgProvider extends AbstractHafasLegacyProvider { currentTime.clear(); ParserUtils.parseGermanDate(currentTime, mHeadFine.group(2)); ParserUtils.parseEuropeanTime(currentTime, mHeadFine.group(3)); - final List departures = new ArrayList(8); + final List departures = new ArrayList<>(8); String oldZebra = null; final Matcher mDepCoarse = P_DEPARTURES_COARSE.matcher(mHeadCoarse.group(3)); @@ -330,7 +330,7 @@ public class InvgProvider extends AbstractHafasLegacyProvider { throw new IllegalStateException("cannot normalize type '" + type + "'"); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { STYLES.put("B10", new Style(Style.parseColor("#DA2510"), Style.WHITE)); diff --git a/enabler/src/de/schildbach/pte/KvvProvider.java b/enabler/src/de/schildbach/pte/KvvProvider.java index 0bf986df..c3ba4f4d 100644 --- a/enabler/src/de/schildbach/pte/KvvProvider.java +++ b/enabler/src/de/schildbach/pte/KvvProvider.java @@ -74,7 +74,7 @@ public class KvvProvider extends AbstractEfaProvider { return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { // S-Bahn diff --git a/enabler/src/de/schildbach/pte/LinzProvider.java b/enabler/src/de/schildbach/pte/LinzProvider.java index 6c09d253..5b71cec7 100644 --- a/enabler/src/de/schildbach/pte/LinzProvider.java +++ b/enabler/src/de/schildbach/pte/LinzProvider.java @@ -38,7 +38,7 @@ public class LinzProvider extends AbstractEfaProvider { setStyles(STYLES); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { STYLES.put("B11", new Style(Style.Shape.RECT, Style.parseColor("#f27b02"), Style.WHITE)); diff --git a/enabler/src/de/schildbach/pte/MvvProvider.java b/enabler/src/de/schildbach/pte/MvvProvider.java index d43db694..30c877b1 100644 --- a/enabler/src/de/schildbach/pte/MvvProvider.java +++ b/enabler/src/de/schildbach/pte/MvvProvider.java @@ -95,7 +95,7 @@ public class MvvProvider extends AbstractEfaProvider { return super.parsePosition(position); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { STYLES.put("SS1", new Style(Style.parseColor("#00ccff"), Style.WHITE)); diff --git a/enabler/src/de/schildbach/pte/SeptaProvider.java b/enabler/src/de/schildbach/pte/SeptaProvider.java index b667080f..76d10c74 100644 --- a/enabler/src/de/schildbach/pte/SeptaProvider.java +++ b/enabler/src/de/schildbach/pte/SeptaProvider.java @@ -154,7 +154,7 @@ public class SeptaProvider extends AbstractHafasLegacyProvider { ParserUtils.parseAmericanDate(currentTime, mPageCoarse.group(2)); ParserUtils.parseAmericanTime(currentTime, mPageCoarse.group(3)); - final List departures = new ArrayList(8); + final List departures = new ArrayList<>(8); String oldZebra = null; final Matcher mDepCoarse = P_DEPARTURES_COARSE.matcher(mPageCoarse.group(4)); diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java index 49e47085..9a70ee79 100644 --- a/enabler/src/de/schildbach/pte/ShProvider.java +++ b/enabler/src/de/schildbach/pte/ShProvider.java @@ -91,7 +91,7 @@ public class ShProvider extends AbstractHafasMobileProvider { return new Fare("SH-Tarif", Type.ADULT, currency, price, name, null); } - protected static final Map STYLES = new HashMap(); + protected static final Map STYLES = new HashMap<>(); static { // Busse Kiel diff --git a/enabler/src/de/schildbach/pte/Standard.java b/enabler/src/de/schildbach/pte/Standard.java index 2f76f7c1..a82b0b58 100644 --- a/enabler/src/de/schildbach/pte/Standard.java +++ b/enabler/src/de/schildbach/pte/Standard.java @@ -36,7 +36,7 @@ public class Standard { public static final int COLOR_BACKGROUND_BUS = Style.parseColor("#993399"); public static final int COLOR_BACKGROUND_FERRY = Style.BLUE; - public static final Map STYLES = new HashMap(); + public static final Map STYLES = new HashMap<>(); static { STYLES.put(Product.HIGH_SPEED_TRAIN, diff --git a/enabler/src/de/schildbach/pte/SvvProvider.java b/enabler/src/de/schildbach/pte/SvvProvider.java index bec93e0d..079fd270 100644 --- a/enabler/src/de/schildbach/pte/SvvProvider.java +++ b/enabler/src/de/schildbach/pte/SvvProvider.java @@ -80,7 +80,7 @@ public class SvvProvider extends AbstractHafasMobileProvider { return super.splitAddress(address); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { STYLES.put("svv|SS1", new Style(Style.parseColor("#b61d33"), Style.WHITE)); diff --git a/enabler/src/de/schildbach/pte/SydneyProvider.java b/enabler/src/de/schildbach/pte/SydneyProvider.java index a82f28f7..0dab70ca 100644 --- a/enabler/src/de/schildbach/pte/SydneyProvider.java +++ b/enabler/src/de/schildbach/pte/SydneyProvider.java @@ -174,7 +174,7 @@ public class SydneyProvider extends AbstractEfaProvider { return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { STYLES.put("SBMT", new Style(Style.parseColor("#f5a81d"), Style.WHITE)); diff --git a/enabler/src/de/schildbach/pte/TlemProvider.java b/enabler/src/de/schildbach/pte/TlemProvider.java index 1606a32f..1b52604d 100644 --- a/enabler/src/de/schildbach/pte/TlemProvider.java +++ b/enabler/src/de/schildbach/pte/TlemProvider.java @@ -81,7 +81,7 @@ public class TlemProvider extends AbstractEfaProvider { return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { // London diff --git a/enabler/src/de/schildbach/pte/VagfrProvider.java b/enabler/src/de/schildbach/pte/VagfrProvider.java index 89a7c6db..23960c7c 100644 --- a/enabler/src/de/schildbach/pte/VagfrProvider.java +++ b/enabler/src/de/schildbach/pte/VagfrProvider.java @@ -55,7 +55,7 @@ public class VagfrProvider extends AbstractEfaProvider { return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { // Tram diff --git a/enabler/src/de/schildbach/pte/VaoProvider.java b/enabler/src/de/schildbach/pte/VaoProvider.java index 303540a3..26d9d772 100644 --- a/enabler/src/de/schildbach/pte/VaoProvider.java +++ b/enabler/src/de/schildbach/pte/VaoProvider.java @@ -79,7 +79,7 @@ public class VaoProvider extends AbstractHafasMobileProvider { return super.splitAddress(address); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { // Salzburg S-Bahn diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index 7a5a0710..2e9cf137 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -76,7 +76,7 @@ public class VbnProvider extends AbstractHafasMobileProvider { return Product.ALL; } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { // Rostock diff --git a/enabler/src/de/schildbach/pte/VorProvider.java b/enabler/src/de/schildbach/pte/VorProvider.java index fb6ebdd4..330dd73e 100644 --- a/enabler/src/de/schildbach/pte/VorProvider.java +++ b/enabler/src/de/schildbach/pte/VorProvider.java @@ -79,7 +79,7 @@ public class VorProvider extends AbstractHafasMobileProvider { return super.splitAddress(address); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { // Wien diff --git a/enabler/src/de/schildbach/pte/VrnProvider.java b/enabler/src/de/schildbach/pte/VrnProvider.java index 05a7bb7e..52d361dd 100644 --- a/enabler/src/de/schildbach/pte/VrnProvider.java +++ b/enabler/src/de/schildbach/pte/VrnProvider.java @@ -63,7 +63,7 @@ public class VrnProvider extends AbstractEfaProvider { return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { // Straßen- und Stadtbahn Mannheim-Ludwigshafen rnv diff --git a/enabler/src/de/schildbach/pte/VrrProvider.java b/enabler/src/de/schildbach/pte/VrrProvider.java index 190b0ea1..26d46b72 100644 --- a/enabler/src/de/schildbach/pte/VrrProvider.java +++ b/enabler/src/de/schildbach/pte/VrrProvider.java @@ -101,7 +101,7 @@ public class VrrProvider extends AbstractEfaProvider { return super.parseLine(id, network, mot, symbol, name, longName, trainType, trainNum, trainName); } - private static final Map STYLES = new HashMap(); + private static final Map STYLES = new HashMap<>(); static { // Schnellbusse VRR diff --git a/enabler/src/de/schildbach/pte/VrsProvider.java b/enabler/src/de/schildbach/pte/VrsProvider.java index 56ab11f4..4780d333 100644 --- a/enabler/src/de/schildbach/pte/VrsProvider.java +++ b/enabler/src/de/schildbach/pte/VrsProvider.java @@ -174,7 +174,7 @@ public class VrsProvider extends AbstractNetworkProvider { }; protected static final Pattern nrwTarifPattern = Pattern.compile("([\\d]+,\\d\\d)"); - protected static final Map STYLES = new HashMap(); + protected static final Map STYLES = new HashMap<>(); static { // Stadtbahn Köln-Bonn @@ -380,7 +380,7 @@ public class VrsProvider extends AbstractNetworkProvider { final CharSequence page = httpClient.get(url.build()); try { - final List locations = new ArrayList(); + final List locations = new ArrayList<>(); final JSONObject head = new JSONObject(page.toString()); final String error = Strings.emptyToNull(head.optString("error", "").trim()); if (error != null) { @@ -592,7 +592,7 @@ public class VrsProvider extends AbstractNetworkProvider { final CharSequence page = httpClient.get(url.build()); try { - final List locations = new ArrayList(); + final List locations = new ArrayList<>(); final JSONObject head = new JSONObject(page.toString()); final String error = Strings.emptyToNull(head.optString("error", "").trim()); @@ -660,13 +660,13 @@ public class VrsProvider extends AbstractNetworkProvider { @Nullable Set