diff --git a/src/com/studentersamfundet/app/DataHandler.java b/src/com/studentersamfundet/app/DataHandler.java index aba819a..7f60e22 100644 --- a/src/com/studentersamfundet/app/DataHandler.java +++ b/src/com/studentersamfundet/app/DataHandler.java @@ -61,7 +61,7 @@ public class DataHandler { return null; } - public Event[] populateEventList(String category) { + public Event[] getEvents(String category) { if (category.equals(Event.ALL)) { return events.toArray(new Event[events.size()]); } @@ -75,7 +75,7 @@ public class DataHandler { return sorted.toArray(new Event[sorted.size()]); } - public Event[] getAllEventsWithTickets() { + public Event[] getEventsWithTickets() { LinkedList list = new LinkedList(); for (Event event : events) { @@ -87,7 +87,7 @@ public class DataHandler { return list.toArray(new Event[list.size()]); } - public News[] populateNewsList() { + public News[] getNews() { return this.news.toArray(new News[this.news.size()]); } diff --git a/src/com/studentersamfundet/app/ui/ProgramListActivity.java b/src/com/studentersamfundet/app/ui/ProgramListActivity.java index b375d21..0d22236 100644 --- a/src/com/studentersamfundet/app/ui/ProgramListActivity.java +++ b/src/com/studentersamfundet/app/ui/ProgramListActivity.java @@ -91,7 +91,7 @@ public class ProgramListActivity extends BaseDnsActivity { protected ListAdapter createAdapter(String category) { - Event[] events = dataHandler.populateEventList(category); + Event[] events = dataHandler.getEvents(category); ListAdapter adapter = new ArrayAdapter(this, R.layout.event_list_row, R.id.event_list_row_text, events) { @Override