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

fixed matcher names

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@918 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2012-01-28 16:09:47 +00:00
parent b474dc1e68
commit ed91f6c463
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -1895,11 +1895,11 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
protected Line parseLineAndType(final String lineAndType)
{
final Matcher m = P_NORMALIZE_LINE_AND_TYPE.matcher(lineAndType);
if (m.matches())
final Matcher mLineAndType = P_NORMALIZE_LINE_AND_TYPE.matcher(lineAndType);
if (mLineAndType.matches())
{
final String number = m.group(1);
final String type = m.group(2);
final String number = mLineAndType.group(1);
final String type = mLineAndType.group(2);
if (type.length() == 0)
{
@ -1917,16 +1917,16 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
{
if (normalizedType == 'B')
{
final Matcher mBusSpecial = P_NORMALIZE_LINE_BUS.matcher(number);
if (mBusSpecial.matches())
return newLine('B' + mBusSpecial.group(1));
final Matcher mBus = P_NORMALIZE_LINE_BUS.matcher(number);
if (mBus.matches())
return newLine('B' + mBus.group(1));
}
if (normalizedType == 'T')
{
final Matcher mBusSpecial = P_NORMALIZE_LINE_TRAM.matcher(number);
if (mBusSpecial.matches())
return newLine('T' + mBusSpecial.group(1));
final Matcher mTram = P_NORMALIZE_LINE_TRAM.matcher(number);
if (mTram.matches())
return newLine('T' + mTram.group(1));
}
return newLine(normalizedType + number.replaceAll("\\s+", ""));