--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureListAdapter.java	2009/09/28 21:39:49	351
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureListAdapter.java	2009/10/29 11:48:28	485
@@ -60,7 +60,16 @@
 		
 		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);
@@ -69,18 +78,22 @@
 		
 		
 		
-		if ( code.equalsIgnoreCase("ra")) { //ra = regionaltog arriva
+		if ( code.equalsIgnoreCase("ra")) { //RA = regionaltog arriva
 			typeIcon.setImageResource(R.drawable.re);
-		} else if ( code.equalsIgnoreCase("re")) {
+		} else if ( code.equalsIgnoreCase("re")) { //RE=Regionaltog
 			typeIcon.setImageResource(R.drawable.re);
-		} else if ( code.equalsIgnoreCase("l")) {
+		} else if ( code.equalsIgnoreCase("l")) { //L=Lyn
 			typeIcon.setImageResource(R.drawable.lyn);
-		} else if ( code.equalsIgnoreCase("ic")) {
+		} else if ( code.equalsIgnoreCase("ic")) { // IC=Intercity
 			typeIcon.setImageResource(R.drawable.ic);
-		} else if ( code.equalsIgnoreCase("pp")) {
+		} else if ( code.equalsIgnoreCase("pp")) { // PP=Privatbaner (eg. odderbanen eller LokalBanen) 
 			typeIcon.setImageResource(R.drawable.pp);
-		} else if ( code.equalsIgnoreCase("ør")) {
+		} else if ( code.equalsIgnoreCase("ør")) { // ØR=Øresundstog
 			typeIcon.setImageResource(R.drawable.or);
+		} 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 ( code.equalsIgnoreCase("b") ) {
@@ -97,9 +110,7 @@
 			typeIcon.setImageResource(R.drawable.stog_h); //S-Tog:H banen #f05737
 		}  else {
 			typeIcon.setImageResource(R.drawable.unknown);
-		}
-		//Mangler: SJ=Sverige?, EC, 	 
-		
+		}		
 		
 		
 		return root;