You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2020/06/02 09:29:44 UTC
[isis] branch master updated: ISIS-2342 turn interface Command into
abstract class in order to omit empty functions
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new cd9efa8 ISIS-2342 turn interface Command into abstract class in order to omit empty functions
cd9efa8 is described below
commit cd9efa891a1d73ef9b95cb7ca5b203e5232f3a1b
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Tue Jun 2 11:29:01 2020 +0200
ISIS-2342 turn interface Command into abstract class in order to omit empty functions
---
.../src/main/kotlin/org/apache/isis/client/kroviz/ui/Command.kt | 5 +++--
.../main/kotlin/org/apache/isis/client/kroviz/ui/ErrorDialog.kt | 6 +-----
.../kotlin/org/apache/isis/client/kroviz/ui/EventLogDetail.kt | 6 +-----
.../main/kotlin/org/apache/isis/client/kroviz/ui/ExportDialog.kt | 2 +-
.../main/kotlin/org/apache/isis/client/kroviz/ui/FileDialog.kt | 6 +-----
.../main/kotlin/org/apache/isis/client/kroviz/ui/ImageDialog.kt | 5 +++--
.../org/apache/isis/client/kroviz/ui/NotificationDialog.kt | 9 ++++-----
.../kotlin/org/apache/isis/client/kroviz/ui/UndefinedDialog.kt | 5 +----
.../kotlin/org/apache/isis/client/kroviz/ui/kv/ActionPrompt.kt | 2 +-
.../kotlin/org/apache/isis/client/kroviz/ui/kv/LoginPrompt.kt | 2 +-
10 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/Command.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/Command.kt
index 0b0a1f7..33cb1ea 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/Command.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/Command.kt
@@ -3,8 +3,9 @@ package org.apache.isis.client.kroviz.ui
import org.apache.isis.client.kroviz.core.event.RoXmlHttpRequest
import org.apache.isis.client.kroviz.to.Link
-interface Command {
- fun execute() {
+abstract class Command {
+
+ open fun execute() {
// subclass responsibility
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ErrorDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ErrorDialog.kt
index da8f466..8efab8c 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ErrorDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ErrorDialog.kt
@@ -4,7 +4,7 @@ import org.apache.isis.client.kroviz.core.event.LogEntry
import org.apache.isis.client.kroviz.to.HttpError
import org.apache.isis.client.kroviz.ui.kv.RoDialog
-class ErrorDialog(val logEntry: LogEntry) : Command {
+class ErrorDialog(val logEntry: LogEntry) : Command() {
fun open() {
val error = logEntry.getTransferObject() as HttpError
@@ -25,10 +25,6 @@ class ErrorDialog(val logEntry: LogEntry) : Command {
heightPerc = 100).open()
}
- override fun execute() {
- //do nothing
- }
-
private fun toString(stackTrace: List<String>): String {
var answer = ""
for (s in stackTrace) {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/EventLogDetail.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/EventLogDetail.kt
index b0840c9..92e51ed 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/EventLogDetail.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/EventLogDetail.kt
@@ -4,7 +4,7 @@ import org.apache.isis.client.kroviz.core.event.LogEntry
import org.apache.isis.client.kroviz.ui.kv.RoDialog
import org.apache.isis.client.kroviz.utils.Utils
-class EventLogDetail(val logEntry: LogEntry) : Command {
+class EventLogDetail(val logEntry: LogEntry) : Command() {
fun open() {
val formItems = mutableListOf<FormItem>()
@@ -19,8 +19,4 @@ class EventLogDetail(val logEntry: LogEntry) : Command {
rd.open()
}
- override fun execute() {
- ImageDialog().open()
- }
-
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ExportDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ExportDialog.kt
index c3ea773..6256e79 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ExportDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ExportDialog.kt
@@ -7,7 +7,7 @@ import org.apache.isis.client.kroviz.ui.kv.RoDialog
import org.apache.isis.client.kroviz.utils.DomHelper
import org.apache.isis.client.kroviz.utils.Utils
-class ExportDialog() :Command {
+class ExportDialog() :Command() {
private var jsonOutput: String = ""
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/FileDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/FileDialog.kt
index 9deac07..35db03f 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/FileDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/FileDialog.kt
@@ -4,7 +4,7 @@ import org.apache.isis.client.kroviz.core.event.LogEntry
import org.apache.isis.client.kroviz.to.ResultValue
import org.apache.isis.client.kroviz.ui.kv.RoDialog
-class FileDialog(val logEntry: LogEntry) : Command {
+class FileDialog(val logEntry: LogEntry) : Command() {
fun open() {
val rv = logEntry.getTransferObject() as ResultValue
@@ -18,8 +18,4 @@ class FileDialog(val logEntry: LogEntry) : Command {
RoDialog(caption = label, items = formItems, command = this).open()
}
- override fun execute() {
- //do nothing
- }
-
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ImageDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ImageDialog.kt
index 8d41857..d8d98c8 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ImageDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/ImageDialog.kt
@@ -7,10 +7,9 @@ import org.apache.isis.client.kroviz.utils.DomHelper
import org.apache.isis.client.kroviz.utils.ScalableVectorGraphic
import org.apache.isis.client.kroviz.utils.UmlUtils
-@ExperimentalUnsignedTypes
class ImageDialog(
var label: String = defaultLabel,
- private var pumlCode: String = defaultPumlCode) : Command {
+ private var pumlCode: String = defaultPumlCode) : Command() {
companion object {
const val defaultLabel = "UML Diagram Sample"
@@ -25,6 +24,7 @@ class ImageDialog(
private var dialog: RoDialog
private val formItems = mutableListOf<FormItem>()
+ @ExperimentalUnsignedTypes
fun open() {
dialog.open()
UmlUtils.generateDiagram(pumlCode, uuid)
@@ -42,6 +42,7 @@ class ImageDialog(
heightPerc = 80)
}
+ @ExperimentalUnsignedTypes
fun scale(direction: Direction) {
val oldElement = DomHelper.getById(uuid)
val oldStr = oldElement!!.innerHTML
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/NotificationDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/NotificationDialog.kt
index cf5e9fa..ad0cf42 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/NotificationDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/NotificationDialog.kt
@@ -4,11 +4,13 @@ import org.apache.isis.client.kroviz.ui.Command
import org.apache.isis.client.kroviz.ui.FormItem
import org.apache.isis.client.kroviz.ui.kv.RoDialog
-class NotificationDialog(val message: String) : Command {
+class NotificationDialog(val message: String) : Command() {
fun open() {
val formItems = mutableListOf<FormItem>()
- formItems.add(FormItem("Message", "TextArea", message, size = 7))
+ val fi = FormItem("Message", "TextArea", message, size = 7)
+ fi.readOnly = true
+ formItems.add(fi)
val label = "Notifications"
RoDialog(
caption = label,
@@ -18,7 +20,4 @@ class NotificationDialog(val message: String) : Command {
heightPerc = 100).open()
}
- override fun execute() {
- //do nothing
- }
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/UndefinedDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/UndefinedDialog.kt
index 3d56040..186f9f5 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/UndefinedDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/UndefinedDialog.kt
@@ -5,7 +5,7 @@ import org.apache.isis.client.kroviz.ui.Command
import org.apache.isis.client.kroviz.ui.FormItem
import org.apache.isis.client.kroviz.ui.kv.RoDialog
-class UndefinedDialog(val logEntry: LogEntry) : Command {
+class UndefinedDialog(val logEntry: LogEntry) : Command() {
val instruction = """1. Create a ResponseClass under test/kotlin/org.ro.urls with
- url
@@ -29,7 +29,4 @@ class UndefinedDialog(val logEntry: LogEntry) : Command {
heightPerc = 100).open()
}
- override fun execute() {
- //do nothing
- }
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ActionPrompt.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ActionPrompt.kt
index 4221618..a0a0ab8 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ActionPrompt.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/ActionPrompt.kt
@@ -11,7 +11,7 @@ import pl.treksoft.kvision.core.StringPair
import pl.treksoft.kvision.form.select.SimpleSelect
import pl.treksoft.kvision.form.text.TextArea
-class ActionPrompt(val action: Action) : Command {
+class ActionPrompt(val action: Action) : Command() {
private lateinit var form: RoDialog
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/LoginPrompt.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/LoginPrompt.kt
index b4cfc95..c61ba8a 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/LoginPrompt.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/LoginPrompt.kt
@@ -6,7 +6,7 @@ import org.apache.isis.client.kroviz.ui.FormItem
import pl.treksoft.kvision.form.text.Password
import pl.treksoft.kvision.form.text.Text
-class LoginPrompt : Command {
+class LoginPrompt : Command() {
private lateinit var form: RoDialog