From 19229199958c0303c3ee621633ff8214b437f7ab Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 29 Jun 2017 09:31:01 -0700 Subject: [PATCH] Formatting tweaks. --- .../java/com/threerings/getdown/data/Application.java | 8 +++++--- .../java/com/threerings/getdown/launcher/Getdown.java | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/threerings/getdown/data/Application.java b/src/main/java/com/threerings/getdown/data/Application.java index a7d27c3..c9d06e8 100644 --- a/src/main/java/com/threerings/getdown/data/Application.java +++ b/src/main/java/com/threerings/getdown/data/Application.java @@ -1276,7 +1276,8 @@ public class Application * @param unpacked a set to populate with unpacked resources. */ public List verifyResources (ProgressObserver obs, int[] alreadyValid, - Set unpacked, List toBeInstalled) throws InterruptedException + Set unpacked, List toBeInstalled) + throws InterruptedException { List rsrcs = getAllActiveResources(); List failures = new ArrayList(); @@ -1306,8 +1307,9 @@ public class Application try { if (_digest.validateResource(rsrc, robs)) { - //if the resource is valid but has no _local file, we add it to the resource to install - if (!rsrc.getLocal().exists() && rsrc.getLocalNew().exists() && !toBeInstalled.contains(rsrc)) { + // if the resource is valid but has no _local file, add it to to-install list + if (!toBeInstalled.contains(rsrc) && !rsrc.getLocal().exists() && + rsrc.getLocalNew().exists()) { toBeInstalled.add(rsrc); } // unpack this resource if appropriate diff --git a/src/main/java/com/threerings/getdown/launcher/Getdown.java b/src/main/java/com/threerings/getdown/launcher/Getdown.java index df478a8..c2be622 100644 --- a/src/main/java/com/threerings/getdown/launcher/Getdown.java +++ b/src/main/java/com/threerings/getdown/launcher/Getdown.java @@ -476,7 +476,8 @@ public abstract class Getdown extends Thread // now verify our resources... setStep(Step.VERIFY_RESOURCES); setStatusAsync("m.validating", -1, -1L, false); - List failures = _app.verifyResources(_progobs, alreadyValid, unpacked, _toBeInstalledResouces); + List failures = _app.verifyResources( + _progobs, alreadyValid, unpacked, _toBeInstalledResouces); if (failures == null) { log.info("Resources verified.");