X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Funical%2FEventListActivity.java;h=27eaef5dc26317c53474d25580a55f4a13bd0f8e;hb=6f48b087593f6b58c98a0ef3721334c4f4d4b2f9;hp=cb2ee6d71ca69c46c892226ae833ad15889c2af1;hpb=bbab7d107a15806894f0450c0dc10e195aed5b30;p=unical.git

diff --git a/src/ro/ieval/unical/EventListActivity.java b/src/ro/ieval/unical/EventListActivity.java
index cb2ee6d..27eaef5 100644
--- a/src/ro/ieval/unical/EventListActivity.java
+++ b/src/ro/ieval/unical/EventListActivity.java
@@ -3,7 +3,6 @@ package ro.ieval.unical;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -17,18 +16,17 @@ import android.widget.ListView;
 
 
 public class EventListActivity extends Activity {
-	
-	long dtstart,dtend;
+
 	//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);
-	    
+		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;
 
@@ -42,10 +40,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) {
@@ -62,27 +60,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:
-	        	final Intent i=new Intent(this,AddEventActivity.class);
+		switch (item.getItemId()) {
+			case R.id.add_event:
+				final Intent i=new Intent(this,AddEventActivity.class);
 				startActivity(i);
-	            return true;
-	        default:
-	            return false;
-	    }
+				return true;
+			case R.id.refresh:
+				displayEvents();
+				return true;
+			default:
+				return false;
+		}
 	}
-	
+
 }