From 832c6ed7c4d5a77adf1facc850d5435ee40ac2e2 Mon Sep 17 00:00:00 2001 From: robertko Date: Wed, 14 Sep 2011 17:29:21 +0200 Subject: [PATCH] Cleanup. --- AndroidManifest.xml | 4 +- .../studentersamfundet/app/DataHandler.java | 29 ++++++-------- src/com/studentersamfundet/app/XmlParser.java | 40 +++++++++---------- .../app/{ => ui}/DnsActivity.java | 7 +++- .../app/{ => ui}/ProgramList.java | 4 +- 5 files changed, 43 insertions(+), 41 deletions(-) rename src/com/studentersamfundet/app/{ => ui}/DnsActivity.java (94%) rename src/com/studentersamfundet/app/{ => ui}/ProgramList.java (94%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9f31724..ede6283 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -8,14 +8,14 @@ - - + \ No newline at end of file diff --git a/src/com/studentersamfundet/app/DataHandler.java b/src/com/studentersamfundet/app/DataHandler.java index 8f16441..a17419a 100644 --- a/src/com/studentersamfundet/app/DataHandler.java +++ b/src/com/studentersamfundet/app/DataHandler.java @@ -1,29 +1,24 @@ package com.studentersamfundet.app; -public class DataHandler { - Event events; +import java.util.LinkedList; - void insert(String id, String title, String description, String date, String location, String category) { +public class DataHandler { + private LinkedList events = new LinkedList(); + + public void insert(String id, String title, String description, String date, String location, String category) { int intId = Integer.parseInt(id); if (get(intId) != null) return; Event e = new Event(intId, title, description, date, location, category); - - if (events == null) - events = e; - else { - Event tmp = events; - while (tmp.next != null) - tmp = tmp.next; - tmp.next = e; - } + events.add(e); } - Event get(int id) { - Event e = events; - while (e != null && e.id != id) - e = e.next; - return e; + public Event get(int id) { + for (Event e : events) { + if (e.id == id) + return e; + } + return null; } } diff --git a/src/com/studentersamfundet/app/XmlParser.java b/src/com/studentersamfundet/app/XmlParser.java index baf8e72..3e4b30a 100644 --- a/src/com/studentersamfundet/app/XmlParser.java +++ b/src/com/studentersamfundet/app/XmlParser.java @@ -5,13 +5,13 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; public class XmlParser { - public static DataHandler dh; + private static DataHandler dh; public XmlParser() { dh = new DataHandler(); } - DataHandler parse(NodeList itemNodes) { + public DataHandler parse(NodeList itemNodes) { String id = ""; String title = ""; String description = ""; @@ -36,28 +36,28 @@ public class XmlParser { NodeList categoryNodes = (itemElement).getElementsByTagName("category"); // Convert a Node into an Element. - Element idElement = (Element) idNodes.item(0); - Element titleElement = (Element) titleNodes.item(0); - Element descriptionElement = (Element) descriptionNodes.item(0); - Element dateElement = (Element) dateNodes.item(0); - Element locationElement = (Element) locationNodes.item(0); - Element categoryElement = (Element) categoryNodes.item(0); + Node idElement = idNodes.item(0); + Node titleElement = titleNodes.item(0); + Node descriptionElement = descriptionNodes.item(0); + Node dateElement = dateNodes.item(0); + Node locationElement = locationNodes.item(0); + Node categoryElement = categoryNodes.item(0); // Get all the child nodes. - NodeList idTextNodes = ((Node) idElement).getChildNodes(); - NodeList titleTextNodes = ((Node) titleElement).getChildNodes(); - NodeList descriptionTextNodes = ((Node) descriptionElement).getChildNodes(); - NodeList dateTextNodes = ((Node) dateElement).getChildNodes(); - NodeList locationTextNodes = ((Node) locationElement).getChildNodes(); - NodeList categoryTextNodes = ((Node) categoryElement).getChildNodes(); + NodeList idTextNodes = idElement.getChildNodes(); + NodeList titleTextNodes = titleElement.getChildNodes(); + NodeList descriptionTextNodes = descriptionElement.getChildNodes(); + NodeList dateTextNodes = dateElement.getChildNodes(); + NodeList locationTextNodes = locationElement.getChildNodes(); + NodeList categoryTextNodes = categoryElement.getChildNodes(); // Retrieve the text. - id = ((Node) idTextNodes.item(0)).getNodeValue(); - title = ((Node) titleTextNodes.item(0)).getNodeValue(); - description = ((Node) descriptionTextNodes.item(0)).getNodeValue(); - date = ((Node) dateTextNodes.item(0)).getNodeValue(); - location = ((Node) locationTextNodes.item(0)).getNodeValue(); - category = ((Node) categoryTextNodes.item(0)).getNodeValue(); + id = idTextNodes.item(0).getNodeValue(); + title = titleTextNodes.item(0).getNodeValue(); + description = descriptionTextNodes.item(0).getNodeValue(); + date = dateTextNodes.item(0).getNodeValue(); + location = locationTextNodes.item(0).getNodeValue(); + category = categoryTextNodes.item(0).getNodeValue(); dh.insert(id, title, description, date, location, category); } } diff --git a/src/com/studentersamfundet/app/DnsActivity.java b/src/com/studentersamfundet/app/ui/DnsActivity.java similarity index 94% rename from src/com/studentersamfundet/app/DnsActivity.java rename to src/com/studentersamfundet/app/ui/DnsActivity.java index 002b66a..d72be56 100644 --- a/src/com/studentersamfundet/app/DnsActivity.java +++ b/src/com/studentersamfundet/app/ui/DnsActivity.java @@ -1,7 +1,12 @@ -package com.studentersamfundet.app; +package com.studentersamfundet.app.ui; import org.w3c.dom.NodeList; +import com.studentersamfundet.app.DataHandler; +import com.studentersamfundet.app.FeedFetcher; +import com.studentersamfundet.app.R; +import com.studentersamfundet.app.XmlParser; + import android.app.Activity; import android.content.Context; import android.content.Intent; diff --git a/src/com/studentersamfundet/app/ProgramList.java b/src/com/studentersamfundet/app/ui/ProgramList.java similarity index 94% rename from src/com/studentersamfundet/app/ProgramList.java rename to src/com/studentersamfundet/app/ui/ProgramList.java index 03c55a2..8480823 100644 --- a/src/com/studentersamfundet/app/ProgramList.java +++ b/src/com/studentersamfundet/app/ui/ProgramList.java @@ -1,4 +1,6 @@ -package com.studentersamfundet.app; +package com.studentersamfundet.app.ui; + +import com.studentersamfundet.app.R; import android.app.ListActivity; import android.os.Bundle;