diff --git a/src/main/kotlin/app/termora/database/DataType.kt b/src/main/kotlin/app/termora/database/DataType.kt index 5f9c77e..512dca0 100644 --- a/src/main/kotlin/app/termora/database/DataType.kt +++ b/src/main/kotlin/app/termora/database/DataType.kt @@ -1,11 +1,15 @@ package app.termora.database -enum class DataType { +enum class DataType : IDataType { Host, Snippet, KeyPair, Tag, Macro, KeywordHighlight, - Keymap, + Keymap, ; + + override fun dataType(): String { + return this.name + } } diff --git a/src/main/kotlin/app/termora/database/DatabaseManager.kt b/src/main/kotlin/app/termora/database/DatabaseManager.kt index 8c24c53..886829f 100644 --- a/src/main/kotlin/app/termora/database/DatabaseManager.kt +++ b/src/main/kotlin/app/termora/database/DatabaseManager.kt @@ -117,14 +117,14 @@ class DatabaseManager private constructor() : Disposable { /** * 返回本地所有用户的数据,调用者需要过滤具体用户 */ - inline fun data(type: DataType): List { + inline fun data(type: IDataType): List { return data(type, StringUtils.EMPTY) } /** * 返回本地所有用户的数据,调用者需要过滤具体用户 */ - inline fun data(type: DataType, ownerId: String): List { + inline fun data(type: IDataType, ownerId: String): List { val list = mutableListOf() try { for (data in rawData(type, ownerId)) { @@ -188,19 +188,19 @@ class DatabaseManager private constructor() : Disposable { /** * 不会返回已删除的数据 */ - fun rawData(type: DataType): List { + fun rawData(type: IDataType): List { return rawData(type, StringUtils.EMPTY) } /** * 不会返回已删除的数据 */ - fun rawData(type: DataType, ownerId: String): List { + fun rawData(type: IDataType, ownerId: String): List { val list = mutableListOf() lock.withLock { transaction(database) { val query = DataEntity.selectAll() - .where { (DataEntity.type eq type.name) and (DataEntity.deleted.eq(false)) } + .where { (DataEntity.type eq type.dataType()) and (DataEntity.deleted.eq(false)) } if (ownerId.isNotBlank()) { query.andWhere { DataEntity.ownerId eq ownerId } diff --git a/src/main/kotlin/app/termora/database/IDataType.kt b/src/main/kotlin/app/termora/database/IDataType.kt new file mode 100644 index 0000000..7f69612 --- /dev/null +++ b/src/main/kotlin/app/termora/database/IDataType.kt @@ -0,0 +1,5 @@ +package app.termora.database + +interface IDataType { + fun dataType(): String +} \ No newline at end of file diff --git a/src/main/kotlin/app/termora/keymgr/KeyManagerPanel.kt b/src/main/kotlin/app/termora/keymgr/KeyManagerPanel.kt index 78bf587..fb798a4 100644 --- a/src/main/kotlin/app/termora/keymgr/KeyManagerPanel.kt +++ b/src/main/kotlin/app/termora/keymgr/KeyManagerPanel.kt @@ -514,7 +514,7 @@ class KeyManagerPanel(private val accountOwner: AccountOwner) : JPanel(BorderLay var rows = 1 val step = 2 return FormBuilder.create().layout(layout).padding("2dlu, $formMargin, $formMargin, $formMargin") - .add("File:").xy(1, rows) + .add("${I18n.getString("termora.file")}:").xy(1, rows) .add(fileTextField).xy(3, rows).apply { rows += step } .add("${I18n.getString("termora.keymgr.table.type")}:").xy(1, rows) .add(typeComboBox).xy(3, rows).apply { rows += step } @@ -553,7 +553,7 @@ class KeyManagerPanel(private val accountOwner: AccountOwner) : JPanel(BorderLay } }, messageType = JOptionPane.PLAIN_MESSAGE, - title = "Private Key", + title = I18n.getString("termora.keymgr.private-key"), optionType = JOptionPane.OK_CANCEL_OPTION ) != JOptionPane.OK_OPTION ) { diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index f4410ac..c7448dc 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -10,6 +10,7 @@ termora.no=No termora.date-format=MM/dd/yyyy hh:mm:ss a termora.finder=Finder termora.folder=Folder +termora.file=File termora.explorer=Explorer termora.quit-confirm=Quit {0}? @@ -243,6 +244,7 @@ termora.keymgr.generate=Generate termora.keymgr.import=Import termora.keymgr.export=Export termora.keymgr.edit=Edit +termora.keymgr.private-key=Private Key termora.keymgr.delete-warning=Are you sure you want to delete? termora.keymgr.table.name=Name termora.keymgr.table.type=Type diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties index 8f8e081..585173d 100644 --- a/src/main/resources/i18n/messages_zh_CN.properties +++ b/src/main/resources/i18n/messages_zh_CN.properties @@ -9,6 +9,7 @@ termora.no=否 termora.date-format=yyyy-MM-dd HH:mm:ss termora.finder=访达 termora.folder=文件夹 +termora.file=文件 termora.explorer=文件管理器 termora.quit-confirm=你要退出 {0} 吗? @@ -230,6 +231,7 @@ termora.keymgr.generate=生成 termora.keymgr.import=导入 termora.keymgr.export=导出 termora.keymgr.edit=编辑 +termora.keymgr.private-key=私钥 termora.keymgr.delete-warning=确定要删除吗? termora.keymgr.table.name=名称 termora.keymgr.table.type=类型 diff --git a/src/main/resources/i18n/messages_zh_TW.properties b/src/main/resources/i18n/messages_zh_TW.properties index 5f1c338..3144038 100644 --- a/src/main/resources/i18n/messages_zh_TW.properties +++ b/src/main/resources/i18n/messages_zh_TW.properties @@ -8,6 +8,7 @@ termora.no=否 termora.date-format=yyyy/MM/dd HH:mm:ss termora.finder=訪達 termora.folder=資料夾 +termora.file=文件 termora.explorer=檔案管理器 termora.quit-confirm=你要退出 {0} 嗎? @@ -228,6 +229,7 @@ termora.keymgr.generate=生成 termora.keymgr.import=匯入 termora.keymgr.export=匯出 termora.keymgr.edit=編輯 +termora.keymgr.private-key=私鑰 termora.keymgr.delete-warning=確定要刪除嗎? termora.keymgr.table.name=名稱 termora.keymgr.table.type=型別