use Line dto consistently

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@700 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-06-15 14:56:32 +00:00
parent 4a73175244
commit 36185b840c
16 changed files with 84 additions and 113 deletions

View file

@ -558,8 +558,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
message = null;
}
departures.add(new Departure(plannedTime.getTime(), predictedTime != null ? predictedTime.getTime() : null, line,
line != null ? lineColors(line) : null, null, position, destinationId, destination, capacity, message));
departures.add(new Departure(plannedTime.getTime(), predictedTime != null ? predictedTime.getTime() : null, new Line(null, line,
line != null ? lineColors(line) : null), position, destinationId, destination, capacity, message));
}
}
else
@ -873,7 +873,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
category = shortCategory;
final String lineStr = normalizeLine(category, name);
line = new Line(lineStr, lineColors(lineStr));
line = new Line(null, lineStr, lineColors(lineStr));
}
else if (tag.equals("Walk") || tag.equals("Transfer") || tag.equals("GisRoute"))
{