diff --git a/src/nat/ArchiveController.kiss b/src/nat/ArchiveController.kiss index 072f174..fbd0b92 100644 --- a/src/nat/ArchiveController.kiss +++ b/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/src/nat/ArchiveUI.hx b/src/nat/ArchiveUI.hx index 17a7e9c..02c7625 100644 --- a/src/nat/ArchiveUI.hx +++ b/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/src/nat/CLI.kiss b/src/nat/CLI.kiss index 45df310..ed0f599 100644 --- a/src/nat/CLI.kiss +++ b/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/src/test/DummyUI.hx b/src/test/DummyUI.hx index d9c64cb..7cdd8d4 100644 --- a/src/test/DummyUI.hx +++ b/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("");