From 028511e71874b7942afa45fdb97db0087bd37f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Wed, 31 Aug 2022 23:39:13 +0200
Subject: [PATCH] Improve completing the future in windows

---
 api/src/main/java/com/bartlomiejpluta/base/api/gui/Window.java | 2 --
 .../java/com/bartlomiejpluta/base/api/gui/WindowManager.java   | 2 --
 .../main/java/com/bartlomiejpluta/base/lib/gui/BaseWindow.java | 3 +--
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/Window.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Window.java
index b9bdbda4..442768dd 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/Window.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/Window.java
@@ -15,8 +15,6 @@ public interface Window extends Widget {
 
    CompletableFuture<Window> getFuture();
 
-   void setFuture(CompletableFuture<Window> future);
-
    default void onOpen(WindowManager manager, Object[] args) {
       // do nothing
    }
diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/WindowManager.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/WindowManager.java
index 17e0a9b7..17c1c172 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/gui/WindowManager.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/WindowManager.java
@@ -63,8 +63,6 @@ public final class WindowManager extends BaseWidget {
    }
 
    public CompletableFuture<Window> open(@NonNull Window window, Object... args) {
-      window.setFuture(new CompletableFuture<>());
-
       if (windows.isEmpty()) {
          input.addKeyEventHandler(this::forwardKeyEventToTopWindow);
       }
diff --git a/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWindow.java b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWindow.java
index df34481c..cd54fdee 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWindow.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/lib/gui/BaseWindow.java
@@ -6,7 +6,6 @@ import com.bartlomiejpluta.base.api.gui.*;
 import com.bartlomiejpluta.base.api.screen.Screen;
 import lombok.Getter;
 import lombok.NonNull;
-import lombok.Setter;
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -24,7 +23,6 @@ public abstract class BaseWindow extends BaseWidget implements Window {
    protected WindowPosition windowPosition = WindowPosition.CENTER;
 
    @Getter
-   @Setter
    protected CompletableFuture<Window> future;
 
    protected BaseWindow(Context context, GUI gui, Map<String, Component> refs) {
@@ -104,6 +102,7 @@ public abstract class BaseWindow extends BaseWidget implements Window {
    @Override
    public void onOpen(WindowManager manager, Object[] args) {
       this.manager = manager;
+      this.future = new CompletableFuture<>();
       content.focus();
    }