Clean up previous commit and tabify source files

[unical.git] / src / ro / ieval / unical / DisplayEventActivity.java

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 8055ec131fa3040bc9cc76c31888c9f2eee68607..df885caa7c7afd8885df32589f0a0e03062cd5fd 100644 (file)
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -2,7 +2,7 @@ package ro.ieval.unical;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.GregorianCalendar;
+import java.util.Locale;
 
 import android.app.Activity;
 import android.content.Context;
@@ -29,55 +29,54 @@ public class DisplayEventActivity extends Activity {
                setContentView(R.layout.event_view);
                setTitle(e.title);
                
-           final TextView startday= (TextView) findViewById(R.id.startday);
-           final TextView endday= (TextView) findViewById(R.id.endday);
-           final TextView startdate= (TextView) findViewById(R.id.startdate);
-           final TextView enddate= (TextView) findViewById(R.id.enddate);
-           final TextView starttime= (TextView) findViewById(R.id.starttime);
-           final TextView endtime= (TextView) findViewById(R.id.endtime);
-           
-           GregorianCalendar cstart = new GregorianCalendar();
-           cstart.setTime(new Date(e.dtstart));
-           GregorianCalendar cend = new GregorianCalendar();
-           cend.setTime(new Date(e.dtend));
-           SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy");
-           SimpleDateFormat stf = new SimpleDateFormat("kk:mm:ss");
-           
-           startday.setText(CalendarUtils.DayToString(this,cstart));
-           if(CalendarUtils.DayToString(this,cstart)!=CalendarUtils.DayToString(this, cend))
-               endday.setText(CalendarUtils.DayToString(this, cend));
-           startdate.setText(sdf.format(cstart.getTime()));
-           if(sdf.format(cstart.getTime())!=sdf.format(cend.getTime()))
-               enddate.setText(sdf.format(cend.getTime()));
-           starttime.setText(stf.format(cstart.getTime()));
-           endtime.setText(stf.format(cend.getTime()));
+               final TextView startDay= (TextView) findViewById(R.id.startday);
+               final TextView endDay= (TextView) findViewById(R.id.endday);
+               final TextView startDate= (TextView) findViewById(R.id.startdate);
+               final TextView endDate= (TextView) findViewById(R.id.enddate);
+               final TextView startTime= (TextView) findViewById(R.id.starttime);
+               final TextView endTime= (TextView) findViewById(R.id.endtime);
+               
+               final Date start=new Date(e.dtstart);
+               final Date end=new Date(e.dtend);
+               final SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy", Locale.UK);
+               final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss", Locale.UK);
+               final SimpleDateFormat dayOfWeekFormat = new SimpleDateFormat("E", Locale.UK);
+               
+               startDay.setText(dayOfWeekFormat.format(start));
+               if(dayOfWeekFormat.format(start)!=dayOfWeekFormat.format(end))
+                       endDay.setText(dayOfWeekFormat.format(end));
+               startDate.setText(dateFormat.format(start));
+               if(dateFormat.format(start)!=dateFormat.format(end))
+                       endDate.setText(dateFormat.format(end));
+               startTime.setText(timeFormat.format(start));
+               endTime.setText(timeFormat.format(end));
        }
        
        @Override
        public boolean onCreateOptionsMenu(final Menu menu) {
                final MenuInflater inflater = getMenuInflater();
-           inflater.inflate(R.menu.event, menu);
+               inflater.inflate(R.menu.event, menu);
                return true;
        }
        
        @Override
        public boolean onOptionsItemSelected(final MenuItem item) {
-           // Handle item selection
-           switch (item. getItemId()) {
-               case R.id.NewEvent:
-                       final Intent i=new Intent(this,AddEventActivity.class);
+               // Handle item selection
+               switch (item. getItemId()) {
+                       case R.id.NewEvent:
+                               final Intent i=new Intent(this,AddEventActivity.class);
                                startActivity(i);
-                   return true;
-               case R.id.deleteevent:
-                       final DeleteEventDialog d=new DeleteEventDialog();
-                       d.show(getFragmentManager(), "Delete");
-                       return true;
-               case R.id.eventlist:
-                       final Intent it=new Intent(this,EventListActivity.class);
-                       startActivity(it);
-                       return true;
-               default:
-                   return true;
-           }
+                               return true;
+                       case R.id.deleteevent:
+                               final DeleteEventDialog d=new DeleteEventDialog();
+                               d.show(getFragmentManager(), "Delete");
+                               return true;
+                       case R.id.eventlist:
+                               final Intent it=new Intent(this,EventListActivity.class);
+                               startActivity(it);
+                               return true;
+                       default:
+                               return true;
+               }
        }
 }