--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureListAdapter.java	2009/09/23 12:51:49	336
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureListAdapter.java	2009/10/29 11:48:28	485
@@ -60,43 +60,57 @@
 		
 		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() + " "; //Ugly hack: Append space do simplify icon selection code 
+		String trainNumber = station.getTrainNumber().trim();
+		String code = trainNumber.split(" ")[0];
 		
-		if ( trainNumber.substring(0, 2).equalsIgnoreCase("ra")) { //ra = regionaltog arriva
+		
+		
+		if ( code.equalsIgnoreCase("ra")) { //RA = regionaltog arriva
 			typeIcon.setImageResource(R.drawable.re);
-		} else if (  trainNumber.substring(0, 2).equalsIgnoreCase("re")) {
+		} else if ( code.equalsIgnoreCase("re")) { //RE=Regionaltog
 			typeIcon.setImageResource(R.drawable.re);
-		} else if (  trainNumber.substring(0,1).equalsIgnoreCase("l")) {
+		} else if ( code.equalsIgnoreCase("l")) { //L=Lyn
 			typeIcon.setImageResource(R.drawable.lyn);
-		} else if (  trainNumber.substring(0,2).equalsIgnoreCase("ic")) {
+		} else if ( code.equalsIgnoreCase("ic")) { // IC=Intercity
 			typeIcon.setImageResource(R.drawable.ic);
-		} else if ( trainNumber.substring(0,2).equalsIgnoreCase("pp")) {
+		} else if ( code.equalsIgnoreCase("pp")) { // PP=Privatbaner (eg. odderbanen eller LokalBanen) 
 			typeIcon.setImageResource(R.drawable.pp);
-		} else if ( trainNumber.substring(0,2).equalsIgnoreCase("Ør")) {
+		} else if ( code.equalsIgnoreCase("ør")) { // ØR=Øresundstog
 			typeIcon.setImageResource(R.drawable.or);
-		} else if ( trainNumber.equalsIgnoreCase("a ") ) {
+		} else if ( code.equalsIgnoreCase("ec")) { // EC=EuroCity
+			typeIcon.setImageResource(R.drawable.ec); 
+		} else if ( code.equalsIgnoreCase("sj")) { // SJ=Svenska Jernbaner
+			typeIcon.setImageResource(R.drawable.sj); 
+		} else if ( code.equalsIgnoreCase("a") ) {
 			typeIcon.setImageResource(R.drawable.stog_a); //S-Tog: A banen #00b5f1
-		} else if ( trainNumber.equalsIgnoreCase("b ") ) {
+		} else if ( code.equalsIgnoreCase("b") ) {
 			typeIcon.setImageResource(R.drawable.stog_b); //S-Tog:B banen #5aba52
-		} else if ( trainNumber.equalsIgnoreCase("bx ") ) {
+		} else if ( code.equalsIgnoreCase("bx") ) {
 			typeIcon.setImageResource(R.drawable.stog_bx); //S-Tog:Bx banen #a4d17d
-		} else if ( trainNumber.equalsIgnoreCase("c ") ) {
+		} else if ( code.equalsIgnoreCase("c") ) {
 			typeIcon.setImageResource(R.drawable.stog_c); //S-Tog:C banen #f89734
-		} else if ( trainNumber.equalsIgnoreCase("e ") ) {
+		} else if ( code.equalsIgnoreCase("e") ) {
 			typeIcon.setImageResource(R.drawable.stog_e); //S-Tog:E banen #837eba
-		} else if ( trainNumber.equalsIgnoreCase("f ") ) {
+		} else if ( code.equalsIgnoreCase("f") ) {
 			typeIcon.setImageResource(R.drawable.stog_f); //S-Tog:F banen #ffc32d
-		} else if ( trainNumber.equalsIgnoreCase("h ") ) {
+		} 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, 	 
-		
+		}		
 		
 		
 		return root;