X-Git-Url: http://jaekl.net/gitweb/?p=frank.git;a=blobdiff_plain;f=prod%2Fnet%2Fjaekl%2Ffrank%2FSchedule.java;h=10616b23007608c5802fb4989ee61dbf8408295e;hp=edd1b398a602afff7e23aa734d892ee5de6c8a1f;hb=60dc53edca9ae2bcd6703e02b26acd47ef3d61a8;hpb=418e4d229a8b607b022cfb867bb702bec1765d13
diff --git a/prod/net/jaekl/frank/Schedule.java b/prod/net/jaekl/frank/Schedule.java
index edd1b39..10616b2 100644
--- a/prod/net/jaekl/frank/Schedule.java
+++ b/prod/net/jaekl/frank/Schedule.java
@@ -13,13 +13,15 @@ import net.jaekl.frank.octranspo.StopInfo;
import net.jaekl.frank.octranspo.Trip;
public class Schedule {
- Locale m_locale;
- FrankBundle m_bundle;
DateFormat m_hourMinFmt;
DateFormat m_hourMinSecFmt;
+ FrankBundle m_bundle;
+ Locale m_locale;
+ Style m_style;
public Schedule(Locale locale) {
m_locale = locale;
+ m_style = new Style();
m_bundle = FrankBundle.getInst(locale);
m_hourMinFmt = new SimpleDateFormat("hh:mma", locale);
m_hourMinSecFmt = new SimpleDateFormat("hh:mm:ssa", locale);
@@ -40,17 +42,7 @@ public class Schedule {
String mapUrl(double latitude, double longitude) {
return "http://www.openstreetmap.org/?mlat=" + latitude + "&mlon=" + longitude + "&zoom=15";
}
-
- void writeStyle(PrintWriter pw) {
- pw.println("");
- }
-
+
// Countdown timer that updates time remaining until each bus is expected.
void writeScript(PrintWriter pw, String remainArray, int remainCount) {
String min = trans(FrankBundle.MINUTES);
@@ -82,7 +74,7 @@ public class Schedule {
pw.println("");
pw.println("");
pw.println("" + title + "");
- writeStyle(pw);
+ new Style().writeStyle(pw);
pw.println("");
}