--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureListAdapter.java	2009/08/10 10:46:07	250
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureListAdapter.java	2009/10/29 10:49:14	483
@@ -60,30 +60,54 @@
 		
 		if (station.getStatus().length() > 0 || station.getNote().length() > 0) {
 			ImageView image = (ImageView) root.findViewById(R.id.InfoIcon);
-			image.setImageResource(R.drawable.info20);
+			
+			int iconID;
+			if (station.getStatus().toLowerCase().indexOf("aflyst") > -1 || 
+					station.getNote().toLowerCase().indexOf("aflyst") > -1 ) {
+				iconID = R.drawable.warn20;
+			} else {
+				iconID = R.drawable.info20;
+			}
+				
+			image.setImageResource( iconID );
 		}
 		
 		ImageView typeIcon = (ImageView) root.findViewById(R.id.TypeIcon);
-		String trainNumber = station.getTrainNumber();
-		if ( trainNumber.substring(0, 2).equalsIgnoreCase("ra")) {
-			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 ")) {
-			typeIcon.setImageResource(R.drawable.stog);
+		String trainNumber = station.getTrainNumber().trim();
+		String code = trainNumber.split(" ")[0];
+		
+		
+		
+		if ( code.equalsIgnoreCase("ra")) { //ra = regionaltog arriva
+			typeIcon.setImageResource(R.drawable.re);
+		} else if ( code.equalsIgnoreCase("re")) {
+			typeIcon.setImageResource(R.drawable.re);
+		} else if ( code.equalsIgnoreCase("l")) {
+			typeIcon.setImageResource(R.drawable.lyn);
+		} else if ( code.equalsIgnoreCase("ic")) {
+			typeIcon.setImageResource(R.drawable.ic);
+		} else if ( code.equalsIgnoreCase("pp")) {
+			typeIcon.setImageResource(R.drawable.pp);
+		} else if ( code.equalsIgnoreCase("ør")) {
+			typeIcon.setImageResource(R.drawable.or);
+		} else if ( code.equalsIgnoreCase("a") ) {
+			typeIcon.setImageResource(R.drawable.stog_a); //S-Tog: A banen #00b5f1
+		} else if ( code.equalsIgnoreCase("b") ) {
+			typeIcon.setImageResource(R.drawable.stog_b); //S-Tog:B banen #5aba52
+		} else if ( code.equalsIgnoreCase("bx") ) {
+			typeIcon.setImageResource(R.drawable.stog_bx); //S-Tog:Bx banen #a4d17d
+		} else if ( code.equalsIgnoreCase("c") ) {
+			typeIcon.setImageResource(R.drawable.stog_c); //S-Tog:C banen #f89734
+		} else if ( code.equalsIgnoreCase("e") ) {
+			typeIcon.setImageResource(R.drawable.stog_e); //S-Tog:E banen #837eba
+		} else if ( code.equalsIgnoreCase("f") ) {
+			typeIcon.setImageResource(R.drawable.stog_f); //S-Tog:F banen #ffc32d
+		} else if ( code.equalsIgnoreCase("h") ) {
+			typeIcon.setImageResource(R.drawable.stog_h); //S-Tog:H banen #f05737
+		}  else {
+			typeIcon.setImageResource(R.drawable.unknown);
 		}
+		//Mangler: SJ=Sverige?, EC,