expvintl/NeoTerm_System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Component: Use advanced list reloading operation

Browse Source
This commit is contained in:
zt515
2017-12-27 00:03:38 +08:00
parent 2ca2a47049
commit d2e9f06de3
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/io/neoterm/component/colorscheme/ColorSchemeComponent.kt
View File

@ -54,11 +54,9 @@ class ColorSchemeComponent : ConfigFileBasedComponent<NeoColorScheme>(NeoTermPat
File(baseDir) File(baseDir)
.listFiles(NEOLANG_FILTER) .listFiles(NEOLANG_FILTER)
.mapNotNull { this.loadConfigure(it) }
.forEach { .forEach {
val colorScheme = this.loadConfigure(it) colors.put(it.colorName, it)
if (colorScheme != null) {
colors.put(colorScheme.colorName, colorScheme)
}
} }
if (colors.containsKey(DefaultColorScheme.colorName)) { if (colors.containsKey(DefaultColorScheme.colorName)) {

9
app/src/main/java/io/neoterm/component/extrakey/ExtraKeyComponent.kt
View File

@ -62,13 +62,10 @@ class ExtraKeyComponent : ConfigFileBasedComponent<NeoExtraKey>(NeoTermPath.EKS_
extraKeys.clear() extraKeys.clear()
File(baseDir) File(baseDir)
.listFiles(NEOLANG_FILTER) .listFiles(NEOLANG_FILTER)
.filterNot { it.absolutePath != NeoTermPath.EKS_DEFAULT_FILE }
.mapNotNull { this.loadConfigure(it) }
.forEach { .forEach {
if (it.absolutePath != NeoTermPath.EKS_DEFAULT_FILE) { registerShortcutKeys(it)
val extraKey = this.loadConfigure(it)
if (extraKey != null) {
registerShortcutKeys(extraKey)
}
}
} }
} }
} }

5
app/src/main/java/io/neoterm/component/profile/ProfileComponent.kt
View File

@ -32,7 +32,10 @@ class ProfileComponent : ConfigFileBasedComponent<NeoProfile>(NeoTermPath.PROFIL
fun reloadProfiles() { fun reloadProfiles() {
profileList.clear() profileList.clear()
File(baseDir)
.listFiles(NEOLANG_FILTER)
.map { this.loadConfigure(it) }
.filterNotNullTo(profileList)
} }
fun registerProfile(metaName: String, prototype: Class<out NeoProfile>) { fun registerProfile(metaName: String, prototype: Class<out NeoProfile>) {