--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureListAdapter.java	2009/08/10 16:58:22	253
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureListAdapter.java	2009/09/22 13:57:36	332
@@ -64,23 +64,35 @@
 		}
 		
 		ImageView typeIcon = (ImageView) root.findViewById(R.id.TypeIcon);
-		String trainNumber = station.getTrainNumber();
-		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);
-		}
+		String trainNumber = station.getTrainNumber() + " "; //Ugly hack: Append space do simplify icon selection code 
+		
+		
+		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.equalsIgnoreCase("a ") ) {
+			typeIcon.setImageResource(R.drawable.stog); //S-Tog: A banen
+		} else if ( trainNumber.equalsIgnoreCase("b ") ) {
+			typeIcon.setImageResource(R.drawable.stog); //S-Tog:B banen
+		} else if ( trainNumber.equalsIgnoreCase("bx ") ) {
+			typeIcon.setImageResource(R.drawable.stog); //S-Tog:Bx banen
+		} else if ( trainNumber.equalsIgnoreCase("c ") ) {
+			typeIcon.setImageResource(R.drawable.stog); //S-Tog:C banen
+		} else if ( trainNumber.equalsIgnoreCase("e ") ) {
+			typeIcon.setImageResource(R.drawable.stog); //S-Tog:E banen
+		} else if ( trainNumber.equalsIgnoreCase("f ") ) {
+			typeIcon.setImageResource(R.drawable.stog); //S-Tog:F banen
+		} else if ( trainNumber.equalsIgnoreCase("h ") ) {
+			typeIcon.setImageResource(R.drawable.stog); //S-Tog:H banen
+		} 
+		//Mangler: ØR=Øresund, SJ=Sverige?, EC,