--- android/TrainInfo/src/dk/thoerup/traininfo/ShortcutActivity.java	2011/07/08 15:39:44	1561
+++ android/TrainInfo/src/dk/thoerup/traininfo/ShortcutActivity.java	2011/07/08 16:26:09	1562
@@ -11,6 +11,7 @@
 import android.widget.Toast;
 import dk.thoerup.android.traininfo.common.StationEntry;
 import dk.thoerup.traininfo.WelcomeScreen.ListType;
+import dk.thoerup.traininfo.util.StationEntryCsv;
 
 public class ShortcutActivity extends Activity {
     
@@ -67,7 +68,7 @@
         	String stationStr = intent.getStringExtra("station");
         	
         	if (stationStr != null) { //haven't reproduced it, but got a stacktrace where stationStr apparently was null
-        		StationEntry station = StationEntry.fromCSV(stationStr);
+        		StationEntry station = StationEntryCsv.fromCSV(stationStr);
 
         		Intent launcher = new Intent( this, DepartureList.class );
         		launcher.putExtra("stationbean", station);
@@ -109,7 +110,7 @@
         // First, set up the shortcut intent.  
         Intent shortcutIntent = new Intent(Intent.ACTION_MAIN);
         shortcutIntent.setClassName(this, this.getClass().getName());
-        shortcutIntent.putExtra("station", station.toCSV() );
+        shortcutIntent.putExtra("station", StationEntryCsv.toCSV(station) );
 
         
         // Then, set up the container intent (the response to the caller)