From d2e9f06de37a7c47c690564343c155c1b37fea67 Mon Sep 17 00:00:00 2001
From: zt515 <kiva515@foxmail.com>
Date: Wed, 27 Dec 2017 00:03:38 +0800
Subject: [PATCH] Component: Use advanced list reloading operation

---
 .../component/colorscheme/ColorSchemeComponent.kt        | 6 ++----
 .../io/neoterm/component/extrakey/ExtraKeyComponent.kt   | 9 +++------
 .../io/neoterm/component/profile/ProfileComponent.kt     | 5 ++++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/io/neoterm/component/colorscheme/ColorSchemeComponent.kt b/app/src/main/java/io/neoterm/component/colorscheme/ColorSchemeComponent.kt
index 1056eec..6f162df 100644
--- a/app/src/main/java/io/neoterm/component/colorscheme/ColorSchemeComponent.kt
+++ b/app/src/main/java/io/neoterm/component/colorscheme/ColorSchemeComponent.kt
@@ -54,11 +54,9 @@ class ColorSchemeComponent : ConfigFileBasedComponent<NeoColorScheme>(NeoTermPat
 
         File(baseDir)
                 .listFiles(NEOLANG_FILTER)
+                .mapNotNull { this.loadConfigure(it) }
                 .forEach {
-                    val colorScheme = this.loadConfigure(it)
-                    if (colorScheme != null) {
-                        colors.put(colorScheme.colorName, colorScheme)
-                    }
+                    colors.put(it.colorName, it)
                 }
 
         if (colors.containsKey(DefaultColorScheme.colorName)) {
diff --git a/app/src/main/java/io/neoterm/component/extrakey/ExtraKeyComponent.kt b/app/src/main/java/io/neoterm/component/extrakey/ExtraKeyComponent.kt
index 3a16cab..6759ee1 100644
--- a/app/src/main/java/io/neoterm/component/extrakey/ExtraKeyComponent.kt
+++ b/app/src/main/java/io/neoterm/component/extrakey/ExtraKeyComponent.kt
@@ -62,13 +62,10 @@ class ExtraKeyComponent : ConfigFileBasedComponent<NeoExtraKey>(NeoTermPath.EKS_
         extraKeys.clear()
         File(baseDir)
                 .listFiles(NEOLANG_FILTER)
+                .filterNot { it.absolutePath != NeoTermPath.EKS_DEFAULT_FILE }
+                .mapNotNull { this.loadConfigure(it) }
                 .forEach {
-                    if (it.absolutePath != NeoTermPath.EKS_DEFAULT_FILE) {
-                        val extraKey = this.loadConfigure(it)
-                        if (extraKey != null) {
-                            registerShortcutKeys(extraKey)
-                        }
-                    }
+                    registerShortcutKeys(it)
                 }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/neoterm/component/profile/ProfileComponent.kt b/app/src/main/java/io/neoterm/component/profile/ProfileComponent.kt
index aa1f8db..1ce19b2 100644
--- a/app/src/main/java/io/neoterm/component/profile/ProfileComponent.kt
+++ b/app/src/main/java/io/neoterm/component/profile/ProfileComponent.kt
@@ -32,7 +32,10 @@ class ProfileComponent : ConfigFileBasedComponent<NeoProfile>(NeoTermPath.PROFIL
 
     fun reloadProfiles() {
         profileList.clear()
-
+        File(baseDir)
+                .listFiles(NEOLANG_FILTER)
+                .map { this.loadConfigure(it) }
+                .filterNotNullTo(profileList)
     }
 
     fun registerProfile(metaName: String, prototype: Class<out NeoProfile>) {