From 99a093a1c74b2fee011f14372613ae0548aed830 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sun, 17 Sep 2017 09:26:13 -0700 Subject: [PATCH] Allow any collection of resources to be downloaded. --- .../java/com/threerings/getdown/net/Downloader.java | 10 +++++----- .../com/threerings/getdown/net/HTTPDownloader.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/threerings/getdown/net/Downloader.java b/src/main/java/com/threerings/getdown/net/Downloader.java index 7b3c32e..4d80c66 100644 --- a/src/main/java/com/threerings/getdown/net/Downloader.java +++ b/src/main/java/com/threerings/getdown/net/Downloader.java @@ -8,8 +8,8 @@ package com.threerings.getdown.net; import java.io.File; import java.io.IOException; +import java.util.Collection; import java.util.HashMap; -import java.util.List; import java.util.Map; import com.threerings.getdown.data.Resource; @@ -64,7 +64,7 @@ public abstract class Downloader extends Thread * the specified observer. The {@link #download} method must be called on the downloader to * initiate the download process. */ - public Downloader (List resources, Observer obs) + public Downloader (Collection resources, Observer obs) { super("Downloader"); _resources = resources; @@ -209,7 +209,7 @@ public abstract class Downloader extends Thread throw new DownloadAbortedException(); } } - } + } } /** @@ -230,8 +230,8 @@ public abstract class Downloader extends Thread */ protected abstract void doDownload (Resource rsrc) throws IOException; - /** The list of resources to be downloaded. */ - protected List _resources; + /** The resources to be downloaded. */ + protected Collection _resources; /** The reported sizes of our resources. */ protected Map _sizes = new HashMap(); diff --git a/src/main/java/com/threerings/getdown/net/HTTPDownloader.java b/src/main/java/com/threerings/getdown/net/HTTPDownloader.java index 139e116..95c5272 100644 --- a/src/main/java/com/threerings/getdown/net/HTTPDownloader.java +++ b/src/main/java/com/threerings/getdown/net/HTTPDownloader.java @@ -10,7 +10,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URLConnection; -import java.util.List; +import java.util.Collection; import com.samskivert.io.StreamUtil; @@ -25,7 +25,7 @@ import static com.threerings.getdown.Log.log; */ public class HTTPDownloader extends Downloader { - public HTTPDownloader (List resources, Observer obs) + public HTTPDownloader (Collection resources, Observer obs) { super(resources, obs); }