ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-21 13:57:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Minor: add another emoji, import a couple of changes for Enterprise

Browse Source
This commit is contained in:
Mike Hearn 2017-06-30 11:34:00 +01:00
parent 1c2265d3b7
commit 82f68f212a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/kotlin/net/corda/core/utilities/Emoji.kt
View File

@ -28,6 +28,7 @@ object Emoji {
@JvmStatic val CODE_SKULL_AND_CROSSBONES: String = codePointsString(0x2620) @JvmStatic val CODE_SKULL_AND_CROSSBONES: String = codePointsString(0x2620)
@JvmStatic val CODE_BOOKS: String = codePointsString(0x1F4DA) @JvmStatic val CODE_BOOKS: String = codePointsString(0x1F4DA)
@JvmStatic val CODE_SLEEPING_FACE: String = codePointsString(0x1F634) @JvmStatic val CODE_SLEEPING_FACE: String = codePointsString(0x1F634)
@JvmStatic val CODE_LIGHTBULB: String = codePointsString(0x1F4A1)
/** /**
* When non-null, toString() methods are allowed to use emoji in the output as we're going to render them to a * When non-null, toString() methods are allowed to use emoji in the output as we're going to render them to a
@ -44,6 +45,7 @@ object Emoji {
val coolGuy: String get() = if (emojiMode.get() != null) "$CODE_COOL_GUY " else "" val coolGuy: String get() = if (emojiMode.get() != null) "$CODE_COOL_GUY " else ""
val books: String get() = if (emojiMode.get() != null) "$CODE_BOOKS " else "" val books: String get() = if (emojiMode.get() != null) "$CODE_BOOKS " else ""
val sleepingFace: String get() = if (emojiMode.get() != null) "$CODE_SLEEPING_FACE " else "" val sleepingFace: String get() = if (emojiMode.get() != null) "$CODE_SLEEPING_FACE " else ""
val lightBulb: String get() = if (emojiMode.get() != null) "$CODE_LIGHTBULB " else ""
// These have old/non-emoji symbols with better platform support. // These have old/non-emoji symbols with better platform support.
val greenTick: String get() = if (emojiMode.get() != null) "$CODE_GREEN_TICK " else "✓" val greenTick: String get() = if (emojiMode.get() != null) "$CODE_GREEN_TICK " else "✓"

2
gradle-plugins/cordformation/src/main/groovy/net/corda/plugins/Node.groovy
View File

@ -218,7 +218,7 @@ class Node extends CordformNode {
*/ */
private File verifyAndGetCordaJar() { private File verifyAndGetCordaJar() {
def maybeCordaJAR = project.configurations.runtime.filter { def maybeCordaJAR = project.configurations.runtime.filter {
it.toString().contains("corda-${project.corda_release_version}.jar") it.toString().contains("corda-${project.corda_release_version}.jar") || it.toString().contains("corda-enterprise-${project.corda_release_version}.jar")
} }
if (maybeCordaJAR.size() == 0) { if (maybeCordaJAR.size() == 0) {
throw new RuntimeException("No Corda Capsule JAR found. Have you deployed the Corda project to Maven? Looked for \"corda-${project.corda_release_version}.jar\"") throw new RuntimeException("No Corda Capsule JAR found. Have you deployed the Corda project to Maven? Looked for \"corda-${project.corda_release_version}.jar\"")

4
node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
View File

@ -72,7 +72,7 @@ open class NodeStartup(val args: Array<String>) {
Node.printBasicNodeInfo(LOGS_CAN_BE_FOUND_IN_STRING, System.getProperty("log-path")) Node.printBasicNodeInfo(LOGS_CAN_BE_FOUND_IN_STRING, System.getProperty("log-path"))
val conf = loadConfigFile(cmdlineOptions) val conf = loadConfigFile(cmdlineOptions)
banJavaSerialisation(conf) banJavaSerialisation(conf)
preNetworkRegistration() preNetworkRegistration(conf)
maybeRegisterWithNetworkAndExit(cmdlineOptions, conf) maybeRegisterWithNetworkAndExit(cmdlineOptions, conf)
logStartupInfo(versionInfo, cmdlineOptions, conf) logStartupInfo(versionInfo, cmdlineOptions, conf)
@ -91,7 +91,7 @@ open class NodeStartup(val args: Array<String>) {
exitProcess(0) exitProcess(0)
} }
open protected fun preNetworkRegistration() = Unit open protected fun preNetworkRegistration(conf: FullNodeConfiguration) = Unit
open protected fun createNode(conf: FullNodeConfiguration, versionInfo: VersionInfo, services: Set<ServiceInfo>): Node { open protected fun createNode(conf: FullNodeConfiguration, versionInfo: VersionInfo, services: Set<ServiceInfo>): Node {
return Node(conf, services, versionInfo, if (conf.useTestClock) TestClock() else NodeClock()) return Node(conf, services, versionInfo, if (conf.useTestClock) TestClock() else NodeClock())