#42 Menu action and tab titles 'De Cameled'

joerg-rade · Jan 25, 2020 · e8f2387 · e8f2387
1 parent 773d4d9
commit e8f2387
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/main/kotlin/org/ro/core/aggregator/ActionDispatcher.kt b/src/main/kotlin/org/ro/core/aggregator/ActionDispatcher.kt
@@ -1,5 +1,6 @@
 package org.ro.core.aggregator
 
+import org.ro.core.Utils
 import org.ro.core.event.LogEntry
 import org.ro.core.event.RoXmlHttpRequest
 import org.ro.to.Action
@@ -42,10 +43,11 @@ class ActionDispatcher(private val at: Point = Point(100,100)) : BaseAggregator(
     private fun processPost(action: Action, link: Link) {
         console.log("[ActionDispatcher.processPost] link.hasArguments: ${link.hasArguments()}")
         console.log(link)
+        val title = Utils.deCamel(action.id)
         if (link.hasArguments()) {
             ActionPrompt(action).open(at)
         } else {
-            RoXmlHttpRequest().invoke(link, ObjectAggregator(action.id))
+            RoXmlHttpRequest().invoke(link, ObjectAggregator(title))
         }
     }
 

diff --git a/src/main/kotlin/org/ro/ui/IconManager.kt b/src/main/kotlin/org/ro/ui/IconManager.kt
@@ -26,6 +26,7 @@ object IconManager {
             "Error" to "bug",
             "Find" to "search",
             "Hsql" to "database",
+            "JEE/CDI" to "sword-light",
             "List" to "list",
             "Log" to "history",
             "Manager" to "manager",

diff --git a/src/main/kotlin/org/ro/ui/kv/MenuFactory.kt b/src/main/kotlin/org/ro/ui/kv/MenuFactory.kt
@@ -1,5 +1,6 @@
 package org.ro.ui.kv
 
+import org.ro.core.Utils
 import org.ro.core.aggregator.ActionDispatcher
 import org.ro.to.Link
 import org.ro.to.Member
@@ -53,10 +54,12 @@ object MenuFactory {
         }
         return dd
     }
+
     private fun action(dd: DropDown, label: String, link: Link) {
         val icon = IconManager.find(label)
         val classes = IconManager.findStyleFor(label)
-        dd.ddLink(label, icon = icon, classes = classes).onClick {
+        val title = Utils.deCamel(label)
+        dd.ddLink(title, icon = icon, classes = classes).onClick {
             ActionDispatcher().invoke(link)
         }
     }
@@ -97,18 +100,13 @@ object MenuFactory {
         switchCssClass(undoItem, DISABLED, WARN)
     }
 
-    private fun switchCssClass(menuItem: Component, from:String, to:String) {
+    private fun switchCssClass(menuItem: Component, from: String, to: String) {
         menuItem.removeCssClass(from)
         menuItem.addCssClass(to)
     }
 
     fun Member.getInvokeLink(): Link? {
-        for (l in links) {
-            if (l.rel.indexOf(id) > 0) {
-                return l
-            }
-        }
-        return null
+        return links.firstOrNull { it.rel.indexOf(id) > 0 }
     }
 
 }