From 1736dd909ea6441863382b06bcf3cc433d8d2324 Mon Sep 17 00:00:00 2001 From: hstyi Date: Mon, 28 Apr 2025 09:11:07 +0800 Subject: [PATCH] chore: folder count (#542) --- src/main/kotlin/app/termora/NewHostTree.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/app/termora/NewHostTree.kt b/src/main/kotlin/app/termora/NewHostTree.kt index 610fa0b..0c6ba7c 100644 --- a/src/main/kotlin/app/termora/NewHostTree.kt +++ b/src/main/kotlin/app/termora/NewHostTree.kt @@ -49,7 +49,7 @@ class NewHostTree : SimpleTree() { private val properties get() = Database.getDatabase().properties private val owner get() = SwingUtilities.getWindowAncestor(this) private val openHostAction get() = ActionManager.getInstance().getAction(OpenHostAction.OPEN_HOST) - private val sftpAction get() = ActionManager.getInstance().getAction(Actions.SFTP) + private val sftpAction get() = ActionManager.getInstance().getAction(app.termora.Actions.SFTP) private var isShowMoreInfo get() = properties.getString("HostTree.showMoreInfo", "false").toBoolean() set(value) = properties.putString("HostTree.showMoreInfo", value.toString()) @@ -117,7 +117,7 @@ class NewHostTree : SimpleTree() { } else if (host.protocol == Protocol.Serial) { text = "${host.name}    ${fontTag.apply(host.options.serialComm.port)}" } else if (host.protocol == Protocol.Folder) { - text = "${host.name}${fontTag.apply(" (${node.childCount})")}" + text = "${host.name}${fontTag.apply(" (${node.getAllChildren().size})")}" } // @formatter:on } @@ -812,7 +812,7 @@ class NewHostTree : SimpleTree() { var group = bookmarkGroups.find { it.bookmarkIds.contains(id) } while (group != null && group.id != "default") { folderNames.addFirst(group.title) - group = bookmarkGroups.find { it.bookmarkGroupIds.contains(group.id) } + group = bookmarkGroups.find { it.bookmarkGroupIds.contains(group?.id ?: StringUtils.EMPTY) } } printer.printRecord(