From 200a9eea27a0fd0226079f9419e2b8a240360c40 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Thu, 8 Aug 2019 22:10:48 -0400 Subject: [PATCH] Add default ViewController.loadView implementation --- .../net/shadowfacts/cacao/viewcontroller/ViewController.kt | 6 +++++- .../net/shadowfacts/cacao/CoordinateConversionTests.kt | 6 +----- src/test/kotlin/net/shadowfacts/cacao/WindowLayoutTests.kt | 6 +----- .../net/shadowfacts/cacao/view/StackViewLayoutTests.kt | 6 +----- .../kotlin/net/shadowfacts/cacao/view/ViewHoverTests.kt | 6 +----- 5 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/main/kotlin/net/shadowfacts/cacao/viewcontroller/ViewController.kt b/src/main/kotlin/net/shadowfacts/cacao/viewcontroller/ViewController.kt index d81325e..5174919 100644 --- a/src/main/kotlin/net/shadowfacts/cacao/viewcontroller/ViewController.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/viewcontroller/ViewController.kt @@ -63,8 +63,12 @@ abstract class ViewController { * * This method should only be called by the framework. After the [view] property is set, the framework is * responsible for initializing its [View.window]/[View.solver] properties and calling [View.wasAdded]. + * + * The default implementation simply creates a [View] and does nothing else with it. */ - abstract fun loadView() + open fun loadView() { + view = View() + } /** * This method is called after the view is loaded, it's properties are initialized, and [View.wasAdded] has been diff --git a/src/test/kotlin/net/shadowfacts/cacao/CoordinateConversionTests.kt b/src/test/kotlin/net/shadowfacts/cacao/CoordinateConversionTests.kt index e8a06b4..d5e8c17 100644 --- a/src/test/kotlin/net/shadowfacts/cacao/CoordinateConversionTests.kt +++ b/src/test/kotlin/net/shadowfacts/cacao/CoordinateConversionTests.kt @@ -21,11 +21,7 @@ class CoordinateConversionTests { @BeforeEach fun setup() { - viewController = object: ViewController() { - override fun loadView() { - view = View() - } - } + viewController = object: ViewController() {} window = Window(viewController) } diff --git a/src/test/kotlin/net/shadowfacts/cacao/WindowLayoutTests.kt b/src/test/kotlin/net/shadowfacts/cacao/WindowLayoutTests.kt index a71dfd0..71b0e12 100644 --- a/src/test/kotlin/net/shadowfacts/cacao/WindowLayoutTests.kt +++ b/src/test/kotlin/net/shadowfacts/cacao/WindowLayoutTests.kt @@ -21,11 +21,7 @@ class WindowLayoutTests { @BeforeEach fun setup() { - viewController = object: ViewController() { - override fun loadView() { - view = View() - } - } + viewController = object: ViewController() {} window = Window(viewController) } diff --git a/src/test/kotlin/net/shadowfacts/cacao/view/StackViewLayoutTests.kt b/src/test/kotlin/net/shadowfacts/cacao/view/StackViewLayoutTests.kt index e75d802..2222d28 100644 --- a/src/test/kotlin/net/shadowfacts/cacao/view/StackViewLayoutTests.kt +++ b/src/test/kotlin/net/shadowfacts/cacao/view/StackViewLayoutTests.kt @@ -23,11 +23,7 @@ class StackViewLayoutTests { @BeforeEach fun setup() { - viewController = object: ViewController() { - override fun loadView() { - view = View() - } - } + viewController = object: ViewController() {} window = Window(viewController) } diff --git a/src/test/kotlin/net/shadowfacts/cacao/view/ViewHoverTests.kt b/src/test/kotlin/net/shadowfacts/cacao/view/ViewHoverTests.kt index fb3bca4..0ccb412 100644 --- a/src/test/kotlin/net/shadowfacts/cacao/view/ViewHoverTests.kt +++ b/src/test/kotlin/net/shadowfacts/cacao/view/ViewHoverTests.kt @@ -31,11 +31,7 @@ class ViewHoverTests { @BeforeEach fun setup() { - viewController = object: ViewController() { - override fun loadView() { - view = View() - } - } + viewController = object: ViewController() {} window = Window(viewController) }