From a4a59f0d40a7a5f5de1c452a6cb9ef56562e4774 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Tue, 12 Oct 2021 13:45:02 -0600 Subject: [PATCH] make controller a required property of ArchiveUI --- projects/nat-archive-tool/src/nat/ArchiveController.kiss | 2 +- projects/nat-archive-tool/src/nat/ArchiveUI.hx | 4 ++-- projects/nat-archive-tool/src/nat/CLI.kiss | 2 -- projects/nat-archive-tool/src/test/DummyUI.hx | 6 +----- .../nat-flixel-desktop-playground/source/PlayState.kiss | 3 --- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/projects/nat-archive-tool/src/nat/ArchiveController.kiss b/projects/nat-archive-tool/src/nat/ArchiveController.kiss index 072f1742..fbd0b928 100644 --- a/projects/nat-archive-tool/src/nat/ArchiveController.kiss +++ b/projects/nat-archive-tool/src/nat/ArchiveController.kiss @@ -149,7 +149,7 @@ :Map commands (new Map) :NameSystem nameSystem (new NameSystem)] - (ui.setController this) + (set ui.controller this) // Add systems! (archive.addSystem nameSystem) diff --git a/projects/nat-archive-tool/src/nat/ArchiveUI.hx b/projects/nat-archive-tool/src/nat/ArchiveUI.hx index 17a7e9ce..02c76251 100644 --- a/projects/nat-archive-tool/src/nat/ArchiveUI.hx +++ b/projects/nat-archive-tool/src/nat/ArchiveUI.hx @@ -4,9 +4,9 @@ import nat.ArchiveController; interface ArchiveUI { /** - * Accept and store a reference to the controller + * Reference to the ArchiveController */ - function setController(controller:ArchiveController):Void; + var controller(default, default):ArchiveController; /** * Prompt the user to enter text diff --git a/projects/nat-archive-tool/src/nat/CLI.kiss b/projects/nat-archive-tool/src/nat/CLI.kiss index 45df310e..ed0f5997 100644 --- a/projects/nat-archive-tool/src/nat/CLI.kiss +++ b/projects/nat-archive-tool/src/nat/CLI.kiss @@ -14,8 +14,6 @@ (prop &mut :ArchiveController controller) -(method :Void setController [controller] (set this.controller controller)) - (defNew []) (method :Void enterText [prompt resolve maxLength] diff --git a/projects/nat-archive-tool/src/test/DummyUI.hx b/projects/nat-archive-tool/src/test/DummyUI.hx index d9c64cb8..7cdd8d41 100644 --- a/projects/nat-archive-tool/src/test/DummyUI.hx +++ b/projects/nat-archive-tool/src/test/DummyUI.hx @@ -4,14 +4,10 @@ import nat.*; import nat.ArchiveController.ChangeSet; class DummyUI implements ArchiveUI { - var controller:ArchiveController = null; + public var controller:ArchiveController = null; public function new() {} - public function setController(controller:ArchiveController) { - this.controller = controller; - } - public function enterText(prompt:String, resolve:(String) -> Void, maxLength:Float) { // TODO for proper testing, this will need to resolve with specific pre-coded strings resolve(""); diff --git a/projects/nat-flixel-desktop-playground/source/PlayState.kiss b/projects/nat-flixel-desktop-playground/source/PlayState.kiss index 798a82fc..7e50994b 100644 --- a/projects/nat-flixel-desktop-playground/source/PlayState.kiss +++ b/projects/nat-flixel-desktop-playground/source/PlayState.kiss @@ -105,9 +105,6 @@ (prop &mut :ArchiveController controller) (prop &mut :Archive archive) -(method :Void setController [controller] - (set this.controller controller)) - (prop &mut :FlxText textInputLabel null) (prop &mut :FlxInputText textInput null)