X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FEventListActivity.java;h=d864079bbaa3bfb10b238fa1066179e20ccb7793;hb=c35783fd5392a9272936d9afad13365b7e6ca780;hp=c9ccd445fbac4c6e2276d06e9ba80ce79a40e439;hpb=8a08d036704efadbfcd4f7c4be1721f915d929c9;p=unical.git

diff --git a/src/ro/ieval/unical/EventListActivity.java b/src/ro/ieval/unical/EventListActivity.java
index c9ccd44..d864079 100644
--- a/src/ro/ieval/unical/EventListActivity.java
+++ b/src/ro/ieval/unical/EventListActivity.java
@@ -17,17 +17,17 @@ import android.widget.ListView;
 
 
 public class EventListActivity extends Activity {
-	
+
 	//Used to refresh events if the user wants to display only certain events
 	//Sry for bad english
 	//Muie la comisie
 	private void displayEvents() {
 		final Event events[]=Event.getAllEvents(getBaseContext());
 		final ListView lv = (ListView) findViewById(R.id.eventlist);
-		
+
 		Arrays.sort(events,new EventComparator());
 		int idx=-1;//index of the first event to be displayed
-		for(int i=0; i<events.length; ++i) 
+		for(int i=0; i<events.length; ++i)
 			if(idx==-1 && events[i].dtend>new Date().getTime()) idx=i;
 		if(idx==-1) idx=0;
 
@@ -41,10 +41,10 @@ public class EventListActivity extends Activity {
 					final long arg3) {
 				DisplayEventActivity.displayEvent(EventListActivity.this,events[arg2]);
 			}
-			
+
 		});
 	}
-	
+
 	private static class EventComparator implements Comparator<Event> {
 		@Override
 		public int compare(final Event lhs, final Event rhs) {
@@ -61,27 +61,30 @@ public class EventListActivity extends Activity {
 	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.event_list);
-		
+
 		displayEvents();
 	}
-	
+
 	@Override
 	public boolean onCreateOptionsMenu(final Menu menu) {
 		final MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.main, menu);
+		inflater.inflate(R.menu.event_list, menu);
 		return true;
 	}
-	
+
 	@Override
 	public boolean onOptionsItemSelected(final MenuItem item) {
 		switch (item.getItemId()) {
-			case R.id.NewEvent:
+			case R.id.add_event:
 				final Intent i=new Intent(this,AddEventActivity.class);
 				startActivity(i);
 				return true;
+			case R.id.refresh:
+				displayEvents();
+				return true;
 			default:
 				return false;
 		}
 	}
-	
+
 }