Tidy up a few rough edges for DemoBench. (corda#507)

* Install DemoBench as a systemwide application. * This application's correct full name is "Corda DemoBench". * Tidy up imports. * Cordapps -> CorDapps * Ensure application name is "Corda DemoBench" on MacOSX.
changjiashuai · Apr 5, 2017 · a9463eb · a9463eb
1 parent 4829524
commit a9463eb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/tools/demobench/build.gradle b/tools/demobench/build.gradle
@@ -170,7 +170,7 @@ task javapackage(dependsOn: 'distZip') {
 
         ant.deploy(nativeBundles: packageType, outdir: pkg_outDir, outfile: 'DemoBench', verbose: 'true') {
             application(name: 'DemoBench', version: pkg_version, mainClass: mainClassName)
-            info(title: 'DemoBench', vendor: 'R3', description: 'A sales and educational tool for demonstrating Corda.')
+            info(title: 'Corda DemoBench', vendor: 'R3', description: 'A sales and educational tool for demonstrating Corda.')
             resources {
                 fileset(dir: "$dist_source/lib", type: 'jar') {
                     include(name: '*.jar')
@@ -190,12 +190,15 @@ task javapackage(dependsOn: 'distZip') {
                 }
             }
 
+            // This is specific to the MacOSX packager.
+            bundleArgument(arg: 'mac.CFBundleName', value: 'Corda DemoBench')
+
             platform {
                 property(name: 'java.util.logging.config.class', value: 'net.corda.demobench.config.LoggingConfig')
                 property(name: 'org.jboss.logging.provider', value: 'slf4j')
             }
 
-            preferences(install: false)
+            preferences(install: true)
         }
     }
 }
diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/DemoBench.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/DemoBench.kt
@@ -1,11 +1,11 @@
 package net.corda.demobench
 
+import java.io.InputStreamReader
+import java.nio.charset.StandardCharsets.UTF_8
 import javafx.scene.image.Image
 import net.corda.demobench.views.DemoBenchView
 import tornadofx.App
 import tornadofx.addStageIcon
-import java.io.InputStreamReader
-import java.nio.charset.StandardCharsets.UTF_8
 
 /**
  * README!

diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/explorer/Explorer.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/explorer/Explorer.kt
@@ -1,9 +1,9 @@
 package net.corda.demobench.explorer
 
-import net.corda.core.utilities.loggerFor
-import net.corda.demobench.readErrorLines
 import java.io.IOException
 import java.util.concurrent.Executors
+import net.corda.core.utilities.loggerFor
+import net.corda.demobench.readErrorLines
 import net.corda.demobench.model.NodeConfig
 import net.corda.demobench.model.forceDirectory
 

diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/views/DemoBenchView.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/views/DemoBenchView.kt
@@ -14,7 +14,7 @@ import net.corda.demobench.ui.CloseableTab
 import org.controlsfx.dialog.ExceptionDialog
 import tornadofx.*
 
-class DemoBenchView : View("Corda Demo Bench") {
+class DemoBenchView : View("Corda DemoBench") {
 
     override val root by fxml<Parent>()
 

diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTabView.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTabView.kt
@@ -70,7 +70,7 @@ class NodeTabView : Fragment() {
                     }
                 }
 
-                fieldset("Cordapps") {
+                fieldset("CorDapps") {
                     styleClass.addAll("cordapps-panel")
 
                     listview(cordapps) {
@@ -81,7 +81,7 @@ class NodeTabView : Fragment() {
                             key.consume()
                         }
                     }
-                    button("Add Cordapp") {
+                    button("Add CorDapp") {
                         setOnAction {
                             val app = (chooser.showOpenDialog(null) ?: return@setOnAction).toPath()
                             if (!cordapps.contains(app)) {
@@ -121,9 +121,9 @@ class NodeTabView : Fragment() {
         model.webPort.value = nodeController.nextPort
         model.h2Port.value = nodeController.nextPort
 
-        chooser.title = "Cordapps"
+        chooser.title = "CorDapps"
         chooser.initialDirectory = jvm.dataHome.toFile()
-        chooser.extensionFilters.add(FileChooser.ExtensionFilter("Cordapps (*.jar)", "*.jar", "*.JAR"))
+        chooser.extensionFilters.add(FileChooser.ExtensionFilter("CorDapps (*.jar)", "*.jar", "*.JAR"))
     }
 
     private fun Pane.nodeNameField() = textfield(model.legalName) {

diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/web/WebServer.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/web/WebServer.kt
@@ -1,9 +1,9 @@
 package net.corda.demobench.web
 
-import net.corda.core.utilities.loggerFor
-import net.corda.demobench.readErrorLines
 import java.io.IOException
 import java.util.concurrent.Executors
+import net.corda.core.utilities.loggerFor
+import net.corda.demobench.readErrorLines
 import net.corda.demobench.model.NodeConfig
 
 class WebServer internal constructor(private val webServerController: WebServerController) : AutoCloseable {