Switch to modern code format. Organize imports. No functional changes.

Java sources use Eclipse 4.5 'Java Conventions' with indentation changed to 4 spaces only per level.
This commit is contained in:
Andreas Schildbach 2016-09-08 17:52:19 +02:00
parent db59817a05
commit 931dafb628
191 changed files with 24827 additions and 27703 deletions

View file

@ -30,92 +30,84 @@ import de.schildbach.pte.dto.Product;
/**
* @author Andreas Schildbach
*/
public class VbbProvider extends AbstractHafasProvider
{
private static final String API_BASE = "http://fahrinfo.vbb.de/bin/";
private static final Product[] PRODUCTS_MAP = { Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM, Product.BUS, Product.FERRY,
Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN };
private static final Set<Product> ALL_EXCEPT_HIGHSPEED_AND_ONDEMAND = EnumSet
.complementOf(EnumSet.of(Product.HIGH_SPEED_TRAIN, Product.ON_DEMAND));
public class VbbProvider extends AbstractHafasProvider {
private static final String API_BASE = "http://fahrinfo.vbb.de/bin/";
private static final Product[] PRODUCTS_MAP = { Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM, Product.BUS,
Product.FERRY, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN };
private static final Set<Product> ALL_EXCEPT_HIGHSPEED_AND_ONDEMAND = EnumSet
.complementOf(EnumSet.of(Product.HIGH_SPEED_TRAIN, Product.ON_DEMAND));
public VbbProvider()
{
super(NetworkId.VBB, API_BASE, "dn", PRODUCTS_MAP);
public VbbProvider() {
super(NetworkId.VBB, API_BASE, "dn", PRODUCTS_MAP);
setJsonGetStopsUseWeight(false);
setJsonGetStopsEncoding(Charsets.UTF_8);
setJsonNearbyLocationsEncoding(Charsets.UTF_8);
setClientType(null);
}
setJsonGetStopsUseWeight(false);
setJsonGetStopsEncoding(Charsets.UTF_8);
setJsonNearbyLocationsEncoding(Charsets.UTF_8);
setClientType(null);
}
private static final Pattern P_SPLIT_NAME_SU = Pattern.compile("(.*?)(?:\\s+\\((S|U|S\\+U)\\))?");
private static final Pattern P_SPLIT_NAME_BUS = Pattern.compile("(.*?)(\\s+\\[[^\\]]+\\])?");
private static final Pattern P_SPLIT_NAME_SU = Pattern.compile("(.*?)(?:\\s+\\((S|U|S\\+U)\\))?");
private static final Pattern P_SPLIT_NAME_BUS = Pattern.compile("(.*?)(\\s+\\[[^\\]]+\\])?");
@Override
protected String[] splitStationName(String name)
{
final Matcher mSu = P_SPLIT_NAME_SU.matcher(name);
if (!mSu.matches())
throw new IllegalStateException(name);
name = mSu.group(1);
final String su = mSu.group(2);
@Override
protected String[] splitStationName(String name) {
final Matcher mSu = P_SPLIT_NAME_SU.matcher(name);
if (!mSu.matches())
throw new IllegalStateException(name);
name = mSu.group(1);
final String su = mSu.group(2);
final Matcher mBus = P_SPLIT_NAME_BUS.matcher(name);
if (!mBus.matches())
throw new IllegalStateException(name);
name = mBus.group(1);
final Matcher mBus = P_SPLIT_NAME_BUS.matcher(name);
if (!mBus.matches())
throw new IllegalStateException(name);
name = mBus.group(1);
final Matcher mParen = P_SPLIT_NAME_PAREN.matcher(name);
if (mParen.matches())
return new String[] { normalizePlace(mParen.group(2)), (su != null ? su + " " : "") + mParen.group(1) };
final Matcher mParen = P_SPLIT_NAME_PAREN.matcher(name);
if (mParen.matches())
return new String[] { normalizePlace(mParen.group(2)), (su != null ? su + " " : "") + mParen.group(1) };
final Matcher mComma = P_SPLIT_NAME_FIRST_COMMA.matcher(name);
if (mComma.matches())
return new String[] { normalizePlace(mComma.group(1)), mComma.group(2) };
final Matcher mComma = P_SPLIT_NAME_FIRST_COMMA.matcher(name);
if (mComma.matches())
return new String[] { normalizePlace(mComma.group(1)), mComma.group(2) };
return super.splitStationName(name);
}
return super.splitStationName(name);
}
private String normalizePlace(final String place)
{
if ("Bln".equals(place))
return "Berlin";
else
return place;
}
private String normalizePlace(final String place) {
if ("Bln".equals(place))
return "Berlin";
else
return place;
}
@Override
protected String[] splitPOI(final String poi)
{
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(poi);
if (m.matches())
return new String[] { m.group(1), m.group(2) };
@Override
protected String[] splitPOI(final String poi) {
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(poi);
if (m.matches())
return new String[] { m.group(1), m.group(2) };
return super.splitStationName(poi);
}
return super.splitStationName(poi);
}
@Override
protected String[] splitAddress(final String address)
{
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address);
if (m.matches())
return new String[] { m.group(1), m.group(2) };
@Override
protected String[] splitAddress(final String address) {
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address);
if (m.matches())
return new String[] { m.group(1), m.group(2) };
return super.splitStationName(address);
}
return super.splitStationName(address);
}
@Override
public Set<Product> defaultProducts()
{
return ALL_EXCEPT_HIGHSPEED_AND_ONDEMAND;
}
@Override
public Set<Product> defaultProducts() {
return ALL_EXCEPT_HIGHSPEED_AND_ONDEMAND;
}
@Override
protected Line parseLineAndType(final String lineAndType)
{
if ("X#".equals(lineAndType))
return newLine(Product.HIGH_SPEED_TRAIN, "X", null); // InterConnex
else
return super.parseLineAndType(lineAndType);
}
@Override
protected Line parseLineAndType(final String lineAndType) {
if ("X#".equals(lineAndType))
return newLine(Product.HIGH_SPEED_TRAIN, "X", null); // InterConnex
else
return super.parseLineAndType(lineAndType);
}
}