--- android/TrainInfo/src/dk/thoerup/traininfo/StationLocator.java	2009/08/10 16:58:22	253
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationLocator.java	2009/08/10 17:01:02	254
@@ -1,23 +1,17 @@
 package dk.thoerup.traininfo;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.json.JSONArray;
-import org.json.JSONObject;
-
 import android.content.Context;
 import android.location.Criteria;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
-import android.location.LocationProvider;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 import dk.thoerup.traininfo.provider.ProviderFactory;
 import dk.thoerup.traininfo.provider.StationProvider;
-import dk.thoerup.traininfo.util.DownloadUtil;
 
 public class StationLocator implements LocationListener{
 
@@ -25,18 +19,18 @@
 	Context cntx;
 	Handler hndl;
 
-	List<StationBean> stationList = new ArrayList<StationBean>();
-
-	
+	StationProvider provider; 
 	Location savedLocation = null;
 
 	public StationLocator(Context c, Handler h) {
 		cntx = c;
 		hndl = h;
+		
+		provider = ProviderFactory.getStationProvider();
 	}
 	
 	public List<StationBean> getStations() {
-		return stationList;
+		return provider.getStations();
 	}
 	
 	public void abortLocationListener() {
@@ -89,11 +83,9 @@
 	}
 	
 	public void findNearestStations(Location location) {
-		StationProvider prov = ProviderFactory.getStationProvider();
-		prov.lookupStations(location);
-		this.stationList = prov.getStations();
+		provider.lookupStations(location);
 		
-		if (stationList.size() > 0) 
+		if ( provider.getStations().size() > 0) 
 			hndl.sendEmptyMessage(TrainInfoList.GOTSTATIONLIST);
 		else
 			hndl.sendEmptyMessage(TrainInfoList.LOOKUPSTATIONFAILED);