AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting tweaks.

Browse Source
This commit is contained in:
Michael Bayne
2017-06-29 09:31:01 -07:00
parent 7c7cdbbe8e
commit 1922919995
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/getdown/data/Application.java
+5 -3
View File
@@ -1276,7 +1276,8 @@ public class Application
* @param unpacked a set to populate with unpacked resources. * @param unpacked a set to populate with unpacked resources.
*/ */
public List<Resource> verifyResources (ProgressObserver obs, int[] alreadyValid, public List<Resource> verifyResources (ProgressObserver obs, int[] alreadyValid,
Set<Resource> unpacked, List<Resource> toBeInstalled) throws InterruptedException Set<Resource> unpacked, List<Resource> toBeInstalled)
throws InterruptedException
{ {
List<Resource> rsrcs = getAllActiveResources(); List<Resource> rsrcs = getAllActiveResources();
List<Resource> failures = new ArrayList<Resource>(); List<Resource> failures = new ArrayList<Resource>();
@@ -1306,8 +1307,9 @@ public class Application
try { try {
if (_digest.validateResource(rsrc, robs)) { if (_digest.validateResource(rsrc, robs)) {
//if the resource is valid but has no _local file, we add it to the resource to install // if the resource is valid but has no _local file, add it to to-install list
if (!rsrc.getLocal().exists() && rsrc.getLocalNew().exists() && !toBeInstalled.contains(rsrc)) { if (!toBeInstalled.contains(rsrc) && !rsrc.getLocal().exists() &&
rsrc.getLocalNew().exists()) {
toBeInstalled.add(rsrc); toBeInstalled.add(rsrc);
} }
// unpack this resource if appropriate // unpack this resource if appropriate
src/main/java/com/threerings/getdown/launcher/Getdown.java
+2 -1
View File
@@ -476,7 +476,8 @@ public abstract class Getdown extends Thread
// now verify our resources... // now verify our resources...
setStep(Step.VERIFY_RESOURCES); setStep(Step.VERIFY_RESOURCES);
setStatusAsync("m.validating", -1, -1L, false); setStatusAsync("m.validating", -1, -1L, false);
List<Resource> failures = _app.verifyResources(_progobs, alreadyValid, unpacked, _toBeInstalledResouces); List<Resource> failures = _app.verifyResources(
_progobs, alreadyValid, unpacked, _toBeInstalledResouces);
if (failures == null) { if (failures == null) {
log.info("Resources verified."); log.info("Resources verified.");