From 431e35d3e21a5eb0eef884d2474aa6095ed5ca6f Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 10 Jan 2013 16:39:46 -0800 Subject: [PATCH] Change name to getAllActiveResources for future comprehensibility. --- .../java/com/threerings/getdown/data/Application.java | 9 +++++---- .../java/com/threerings/getdown/launcher/Getdown.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/threerings/getdown/data/Application.java b/src/main/java/com/threerings/getdown/data/Application.java index 56a86e7..4a673ac 100644 --- a/src/main/java/com/threerings/getdown/data/Application.java +++ b/src/main/java/com/threerings/getdown/data/Application.java @@ -302,9 +302,10 @@ public class Application } /** - * Returns a list of all the {@link Resource} objects used by this application. + * Returns a list of all the active {@link Resource} objects used by this application (code and + * non-code). */ - public List getAllResources () + public List getAllActiveResources () { List allResources = new ArrayList(); allResources.addAll(getActiveCodeResources()); @@ -1208,7 +1209,7 @@ public class Application ProgressObserver obs, int[] alreadyValid, Set unpacked) throws InterruptedException { - List rsrcs = getAllResources(); + List rsrcs = getAllActiveResources(); List failures = new ArrayList(); // total up the file size of the resources to validate @@ -1301,7 +1302,7 @@ public class Application */ public void clearValidationMarkers () { - clearValidationMarkers(getAllResources().iterator()); + clearValidationMarkers(getAllActiveResources().iterator()); } /** diff --git a/src/main/java/com/threerings/getdown/launcher/Getdown.java b/src/main/java/com/threerings/getdown/launcher/Getdown.java index 747ed86..5b613da 100644 --- a/src/main/java/com/threerings/getdown/launcher/Getdown.java +++ b/src/main/java/com/threerings/getdown/launcher/Getdown.java @@ -508,7 +508,7 @@ public abstract class Getdown extends Thread reportTrackingEvent("app_start", -1); // redownload any that are corrupt or invalid... - log.info(failures.size() + " of " + _app.getAllResources().size() + + log.info(failures.size() + " of " + _app.getAllActiveResources().size() + " rsrcs require update (" + alreadyValid[0] + " assumed valid)."); setStep(Step.REDOWNLOAD_RESOURCES); download(failures);