--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/09/16 14:04:28 1061 +++ android/TrainInfoServiceGoogle/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java 2010/09/20 20:11:55 1080 @@ -65,27 +65,30 @@ DepartureBean departureBean = new DepartureBean(); - StationEntry station = stationDao.getById(stationID); + StationEntry station = new StationEntry(); // stationDao.getById(stationID); + station.setId(82); + station.setName("Test Station"); + station.setRegional("HS"); departureBean.stationName = station.getName(); if (station.getRegional() != null) { DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival); - departureBean.departureEntries.addAll( tempBean.departureEntries ); + departureBean.entries.addAll( tempBean.entries ); departureBean.notifications.addAll(tempBean.notifications); } if (station.getStrain() != null) { DepartureBean tempBean = lookupDepartures(station.getStrain(), TrainType.STOG, arrival); - departureBean.departureEntries.addAll( tempBean.departureEntries ); + departureBean.entries.addAll( tempBean.entries ); departureBean.notifications.addAll(tempBean.notifications); } - if (departureBean.departureEntries.size() == 0) { + if (departureBean.entries.size() == 0) { logger.info("No departures found for station " + stationID); } - Collections.sort( departureBean.departureEntries ); + Collections.sort( departureBean.entries ); return departureBean; @@ -195,7 +198,7 @@ departure.setType(typeString); - departureBean.departureEntries.add( departure ); + departureBean.entries.add( departure ); } } } else { @@ -305,7 +308,7 @@ departure.setType(type); - departureBean.departureEntries.add(departure); + departureBean.entries.add(departure); }