From 1ab75cee3c01811a6fe3137973f89c329a50a122 Mon Sep 17 00:00:00 2001 From: Robert Kolner Date: Wed, 28 Sep 2011 19:54:36 +0200 Subject: [PATCH] Fixed a nasty bug in DataHandler.populateList related to comparison of strings. Also optimized function by using for-each loop. --- src/com/studentersamfundet/app/DataHandler.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/com/studentersamfundet/app/DataHandler.java b/src/com/studentersamfundet/app/DataHandler.java index 5c6a664..8459ea8 100644 --- a/src/com/studentersamfundet/app/DataHandler.java +++ b/src/com/studentersamfundet/app/DataHandler.java @@ -25,16 +25,14 @@ public class DataHandler { public Event[] populateList(String category) { LinkedList sorted = new LinkedList(); - if (category == "all") { + if (category.equals("all")) { return events.toArray(new Event[events.size()]); - } else { - for (int i = 0; i < events.size(); i++) { - Event tmp = events.get(i); - - if (category.equals(tmp.category)) - sorted.add(tmp); - } - return sorted.toArray(new Event[sorted.size()]); } + + for (Event event : events) { + if (category.equals(event.category)) + sorted.add(event); + } + return sorted.toArray(new Event[sorted.size()]); } }