From 01cb9f504c860bc1c037a44f3a76bf342a293d46 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Tue, 22 Mar 2016 12:28:35 -0400 Subject: General formatting cleanup and documentation update --- .../main/java/bjc/utils/data/lazy/LazyHolder.java | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/data/lazy/LazyHolder.java') diff --git a/BJC-Utils2/src/main/java/bjc/utils/data/lazy/LazyHolder.java b/BJC-Utils2/src/main/java/bjc/utils/data/lazy/LazyHolder.java index 43dec86..6321cc2 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/data/lazy/LazyHolder.java +++ b/BJC-Utils2/src/main/java/bjc/utils/data/lazy/LazyHolder.java @@ -21,9 +21,9 @@ import bjc.utils.funcdata.FunctionalList; */ public class LazyHolder implements IHolder { /** - * The source for a value held by this lazy holder + * List of queued actions to be performed on realized values */ - private Supplier heldSrc; + private FunctionalList> actions; /** * The value internally held by this lazy holder @@ -31,9 +31,9 @@ public class LazyHolder implements IHolder { private T held; /** - * List of queued actions to be performed on realized values + * The source for a value held by this lazy holder */ - private FunctionalList> actions; + private Supplier heldSrc; /** * Create a new lazy holder with the given supplier @@ -57,9 +57,18 @@ public class LazyHolder implements IHolder { held = val; } + @Override + public void doWith(Consumer f) { + transform((val) -> { + f.accept(val); + + return val; + }); + } + @Override public IHolder map(Function f) { - return new LazyHolder(() -> { + return new LazyHolder<>(() -> { if (held == null) { return actions.reduceAux(heldSrc.get(), Function::apply, f::apply); @@ -89,13 +98,4 @@ public class LazyHolder implements IHolder { return f.apply(held); } - @Override - public void doWith(Consumer f) { - transform((val) -> { - f.accept(val); - - return val; - }); - } - } -- cgit v1.2.3