Tidy up downloader code

nbproject/coverage.properties

@@ -1,5 +1,5 @@
 #coverage viewer module properties for project
-#Tue Jan 06 09:54:06 GMT 2009
+#Tue Jan 06 10:02:47 GMT 2009
 coverage.activity=ON
 project.type=java
 coverage.templateFile=coverage/template.emma

nbproject/project.properties

@@ -73,7 +73,7 @@ run.jvmargs=
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}:\
-    ${file.reference.emma.jar}
+    :${file.reference.emma.jar}
 source.encoding=UTF-8
 src.dir=src
 test.src.dir=test

src/uk/co/md87/evetool/api/io/ApiDownloader.java

@@ -69,27 +69,16 @@ public class ApiDownloader {
 
         final CacheStatus cacheStatus = cache.getCacheStatus(method, args);
 
-        if (cacheStatus == CacheStatus.HIT) {
-            return cache.getCache(method, args);
-        }
-
-        try {
-            final StringBuilder builder = new StringBuilder();
-            for (String line : Downloader.getPage(getUrl(method), ourArgs)) {
-                builder.append(line);
-            }
-
-            cache.setCache(method, args, builder.toString(),
-                    System.currentTimeMillis() + 20000); // TODO: Proper time
-            return cache.getCache(method, args);
-        } catch (IOException ex) {
-            LOGGER.log(Level.WARNING, "API request failed", ex);
-            if (cacheStatus == CacheStatus.EXPIRED) {
-                return cache.getCache(method, args);
-            } else {
-                return null;
+        if (cacheStatus == CacheStatus.MISS || cacheStatus == CacheStatus.EXPIRED) {
+            try {
+                cache.setCache(method, args, Downloader.getPage(getUrl(method), ourArgs),
+                        System.currentTimeMillis() + 20000); // TODO: Proper time
+            } catch (IOException ex) {
+                LOGGER.log(Level.WARNING, "API request failed", ex);
             }
         }
+
+        return cache.getCache(method, args);
     }
 
     protected static String getUrl(final String method) {

src/uk/co/md87/evetool/api/io/Downloader.java

@@ -58,7 +58,7 @@ public final class Downloader {
      * @throws java.net.MalformedURLException If the URL is malformed
      * @throws java.io.IOException If there's an I/O error while downloading
      */
-    public static List<String> getPage(final String url)
+    public static String getPage(final String url)
             throws MalformedURLException, IOException {
         
         return getPage(url, "");
@@ -66,17 +66,18 @@ public final class Downloader {
 
     /**
      * Retrieves the specified page, sending the specified post data.
-     * 
+     *
+     * TODO: Update
      * @param url The URL to retrieve
      * @param postData The raw POST data to send
      * @return A list of lines received from the server
      * @throws java.net.MalformedURLException If the URL is malformed
      * @throws java.io.IOException If there's an I/O error while downloading
      */    
-    public static List<String> getPage(final String url, final String postData)
+    public static String getPage(final String url, final String postData)
             throws MalformedURLException, IOException {
         
-        final List<String> res = new ArrayList<String>();
+        final StringBuilder res = new StringBuilder();
         
         final URLConnection urlConn = getConnection(url, postData);
         
@@ -89,25 +90,26 @@ public final class Downloader {
             line = in.readLine();
             
             if (line != null) {
-                res.add(line);
+                res.append(line);
             }
         } while (line != null);
         
         in.close();
         
-        return res;
+        return res.toString();
     }
     
     /**
      * Retrieves the specified page, sending the specified post data.
-     * 
+     *
+     * TODO: Update
      * @param url The URL to retrieve
      * @param postData A map of post data that should be sent
      * @return A list of lines received from the server
      * @throws java.net.MalformedURLException If the URL is malformed
      * @throws java.io.IOException If there's an I/O error while downloading
      */    
-    public static List<String> getPage(final String url, final Map<String, String> postData)
+    public static String getPage(final String url, final Map<String, String> postData)
             throws MalformedURLException, IOException {        
         return getPage(url, encodeArguments(postData));
     }

src/uk/co/md87/evetool/api/parser/ApiParser.java

@@ -8,6 +8,7 @@ package uk.co.md87.evetool.api.parser;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.List;
+
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;