X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FDisplayEventActivity.java;h=7e2e78f55f29424176a34a346ad440f666ece9eb;hb=55084aed556d98d5ee93d9f4bfe319241ef688a3;hp=bb819b9eb51558facca7f6844b3da8c5fd48b4fe;hpb=f580909cce85fcd4edbba928c795abb2e75564be;p=unical.git diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java index bb819b9..7e2e78f 100644 --- a/src/ro/ieval/unical/DisplayEventActivity.java +++ b/src/ro/ieval/unical/DisplayEventActivity.java @@ -45,7 +45,7 @@ public class DisplayEventActivity extends Activity { final SimpleDateFormat dayOfWeekFormat = new SimpleDateFormat("EEEEEEE", Locale.UK); startDay.setText(dayOfWeekFormat.format(start)); - if(dateFormat.format(start)!=dateFormat.format(end)) { + if(!dateFormat.format(start).equals(dateFormat.format(end))) { endDay.setText(dayOfWeekFormat.format(end)); endDate.setText(dateFormat.format(end)); } @@ -66,20 +66,22 @@ public class DisplayEventActivity extends Activity { public boolean onOptionsItemSelected(final MenuItem item) { // 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(event,this); - 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; + case R.id.deleteevent: + final DeleteEventDialog d=new DeleteEventDialog(event,this); + d.show(getFragmentManager(), "Delete"); + return true; + case R.id.eventlist: + final Intent it=new Intent(this,EventListActivity.class); + startActivity(it); + return true; + case R.id.edit_event: + AddEventActivity.editEvent(DisplayEventActivity.this,event); + return true; + case R.id.add_alarm: + + return true; + default: + return true; } } }