diff --git a/FCL/src/main/java/com/tungsten/fcl/setting/Controllers.java b/FCL/src/main/java/com/tungsten/fcl/setting/Controllers.java index e591327e..1ea5350d 100644 --- a/FCL/src/main/java/com/tungsten/fcl/setting/Controllers.java +++ b/FCL/src/main/java/com/tungsten/fcl/setting/Controllers.java @@ -20,7 +20,6 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.function.Consumer; import java.util.logging.Level; import java.util.stream.Collectors; @@ -29,11 +28,11 @@ public class Controllers { private Controllers() { } - private static final ObservableList controllers = observableArrayList(controller -> new Observable[] { controller }); + private static final ObservableList controllers = observableArrayList(controller -> new Observable[]{controller}); private static final ReadOnlyListWrapper controllersWrapper = new ReadOnlyListWrapper<>(controllers); public static Controller DEFAULT_CONTROLLER; - private static final List> CALLBACKS = new ArrayList<>(); + private static final List CALLBACKS = new ArrayList<>(); public static void checkControllers() { if (controllers.contains(null)) { @@ -103,7 +102,7 @@ public class Controllers { initialized = true; CALLBACKS.forEach(callback -> { - Schedulers.androidUIThread().execute(()->callback.accept(null)); + Schedulers.androidUIThread().execute(() -> callback.run()); }); } @@ -157,12 +156,12 @@ public class Controllers { return controllers.stream().filter(it -> it.getName().equals(name)).findFirst().orElse(controllers.get(0)); } - public static void addCallback(Consumer consumer) { + public static void addCallback(Runnable callback) { if (initialized) { - consumer.accept(null); + callback.run(); return; } - CALLBACKS.add(consumer); + CALLBACKS.add(callback); } } diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/controller/ControllerUI.java b/FCL/src/main/java/com/tungsten/fcl/ui/controller/ControllerUI.java index 831c2780..fd33cb30 100644 --- a/FCL/src/main/java/com/tungsten/fcl/ui/controller/ControllerUI.java +++ b/FCL/src/main/java/com/tungsten/fcl/ui/controller/ControllerUI.java @@ -75,9 +75,7 @@ public class ControllerUI extends FCLCommonUI implements View.OnClickListener { @Override public void onCreate() { super.onCreate(); - Controllers.addCallback(unused -> { - init(); - }); + Controllers.addCallback(this::init); } private void init() {