--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureListAdapter.java	2009/08/10 10:49:43	252
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureListAdapter.java	2009/08/10 16:58:22	253
@@ -65,25 +65,20 @@
 		
 		ImageView typeIcon = (ImageView) root.findViewById(R.id.TypeIcon);
 		String trainNumber = station.getTrainNumber();
-		if ( trainNumber.substring(0, 2).equalsIgnoreCase("ra")) { //ra = regionaltog arriva
-			typeIcon.setImageResource(R.drawable.retog);
-		} else if ( trainNumber.substring(0, 2).equalsIgnoreCase("re")) {
-			typeIcon.setImageResource(R.drawable.retog);
-		} else if (trainNumber.substring(0,1).equalsIgnoreCase("l")) {
-			typeIcon.setImageResource(R.drawable.lyntog);
-		} else if (trainNumber.substring(0,2).equalsIgnoreCase("ic")) {
-			typeIcon.setImageResource(R.drawable.ictog);
-		} else if (trainNumber.substring(0,2).equalsIgnoreCase("pp")) {
-			typeIcon.setImageResource(R.drawable.pptog);
-		} else if (trainNumber.substring(0,2).equalsIgnoreCase("a ")) {
-			typeIcon.setImageResource(R.drawable.stog);
-		} else if (trainNumber.substring(0,2).equalsIgnoreCase("b ")) {
-			typeIcon.setImageResource(R.drawable.stog);
-		} else if (trainNumber.substring(0,2).equalsIgnoreCase("c ")) {
-			typeIcon.setImageResource(R.drawable.stog);
-		} else if (trainNumber.substring(0,2).equalsIgnoreCase("d ")) {
-			typeIcon.setImageResource(R.drawable.stog);
-		} else if (trainNumber.substring(0,2).equalsIgnoreCase("e ")) {
+		if (trainNumber.length() >= 2) {
+			if ( trainNumber.substring(0, 2).equalsIgnoreCase("ra")) { //ra = regionaltog arriva
+				typeIcon.setImageResource(R.drawable.retog);
+			} else if ( trainNumber.substring(0, 2).equalsIgnoreCase("re")) {
+				typeIcon.setImageResource(R.drawable.retog);
+			} else if (trainNumber.substring(0,1).equalsIgnoreCase("l")) {
+				typeIcon.setImageResource(R.drawable.lyntog);
+			} else if (trainNumber.substring(0,2).equalsIgnoreCase("ic")) {
+				typeIcon.setImageResource(R.drawable.ictog);
+			} else if (trainNumber.substring(0,2).equalsIgnoreCase("pp")) {
+				typeIcon.setImageResource(R.drawable.pptog);
+			}
+		} else {
+			//if each line needs seperate icons, switch on the first(and only( character
 			typeIcon.setImageResource(R.drawable.stog);
 		}