X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FDisplayEventActivity.java;h=18f6ef9556b16ec1caabd0fff78d4abcec40ffd6;hb=00b0fd8e83bd390790342ebc41148f4a760d9fb4;hp=0bff03217f7a9a15003b59b921548608e960063c;hpb=539deec9aa94ea7b7736b7597d9470a18204d7f8;p=unical.git

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 0bff032..18f6ef9 100644
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -1,5 +1,6 @@
 package ro.ieval.unical;
 
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -45,7 +46,7 @@ public class DisplayEventActivity extends Activity {
 					final TextView date = (TextView) rowView.findViewById(R.id.alarm_datetime);
 					final Button delete = (Button) rowView.findViewById(R.id.alarm_delete);
 					delete.setOnClickListener(new DeleteListener(getItem(position)));
-					date.setText(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.UK).format(getItem(position)));
+					date.setText(DateFormat.getDateTimeInstance().format(getItem(position)));
 
 					return rowView;
 				}
@@ -75,18 +76,21 @@ public class DisplayEventActivity extends Activity {
 
 		final Date start=new Date(event.dtstart);
 		final Date end=new Date(event.dtend);
-		final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.UK);
-		final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss", Locale.UK);
-		final SimpleDateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
+		final DateFormat dateFormat = DateFormat.getDateInstance();
+		final DateFormat timeFormat = DateFormat.getTimeInstance();
+		final DateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK);
 
 		startDay.setText(dayOfWeekFormat.format(start));
+		startDate.setText(dateFormat.format(start));
 		if(!dateFormat.format(start).equals(dateFormat.format(end))) {
 			endDay.setText(dayOfWeekFormat.format(end));
 			endDate.setText(dateFormat.format(end));
 		}
-		startDate.setText(dateFormat.format(start));
+
 		startTime.setText(timeFormat.format(start));
-		endTime.setText(timeFormat.format(end));
+		if(!start.equals(end))
+			endTime.setText(timeFormat.format(end));
+
 		description.setText(event.description);
 		setAdapter();
 	}