--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2010/01/27 10:04:28 557 +++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java 2010/02/01 16:49:02 572 @@ -1,5 +1,9 @@ package dk.thoerup.traininfo; +import static dk.thoerup.traininfo.R.string.departurelist_fetchdata; +import static dk.thoerup.traininfo.R.string.generic_cancel; +import static dk.thoerup.traininfo.R.string.generic_retry; + import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; @@ -13,6 +17,7 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.ListView; import android.widget.TextView; @@ -66,7 +71,8 @@ int distance = station.getDistance(); ((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." ); - + station.setRegional(true); + Log.e("ASD", "" + station.isRegional() + "/" + station.isSTrain() + "/" + station.isMetro()); if (station.isRegional() == false && station.isSTrain() == false) { getListView().setVisibility( View.GONE ); @@ -128,7 +134,7 @@ switch (id) { case DLG_PROGRESS: ProgressDialog dlg = new ProgressDialog(this); - dlg.setMessage("Fetch departure data"); + dlg.setMessage( getString(departurelist_fetchdata) ); dlg.setCancelable(true); return dlg; default: @@ -186,14 +192,14 @@ AlertDialog.Builder builder = new AlertDialog.Builder(DepartureList.this); builder.setMessage("Error finding departures"); builder.setCancelable(true); - builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() { + builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); startDepartureFetcher(); } }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); }