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

Profile: make profile abstract

Browse Source
This commit is contained in:
zt515 2017-12-12 23:43:41 +08:00
parent 98852aeaec
commit d8c6ff82e3
8 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/io/neoterm/component/config/ConfigureComponent.kt
View File

@ -1,7 +1,7 @@
package io.neoterm.component.config package io.neoterm.component.config
import io.neoterm.component.config.loader.NeoLangConfigureLoader import io.neoterm.component.config.loaders.NeoLangConfigureLoader
import io.neoterm.component.config.loader.OldConfigureLoader import io.neoterm.component.config.loaders.OldConfigureLoader
import io.neoterm.frontend.component.NeoComponent import io.neoterm.frontend.component.NeoComponent
import java.io.File import java.io.File
@ -24,7 +24,7 @@ class ConfigureComponent : NeoComponent {
return CONFIG_LOADER_VERSION return CONFIG_LOADER_VERSION
} }
fun newLoader(configFile: File): IConfigureFileLoader { fun newLoader(configFile: File): IConfigureLoader {
return when (configFile.extension) { return when (configFile.extension) {
"nl" -> NeoLangConfigureLoader(configFile) "nl" -> NeoLangConfigureLoader(configFile)
else -> OldConfigureLoader(configFile) else -> OldConfigureLoader(configFile)

2
app/src/main/java/io/neoterm/component/config/IConfigureFileLoader.kt → app/src/main/java/io/neoterm/component/config/IConfigureLoader.kt
View File

@ -5,6 +5,6 @@ import io.neoterm.frontend.config.NeoConfigureFile
/** /**
* @author kiva * @author kiva
*/ */
interface IConfigureFileLoader { interface IConfigureLoader {
fun loadConfigure() : NeoConfigureFile? fun loadConfigure() : NeoConfigureFile?
} }

6
app/src/main/java/io/neoterm/component/config/loader/NeoLangConfigureLoader.kt → app/src/main/java/io/neoterm/component/config/loaders/NeoLangConfigureLoader.kt
View File

@ -1,13 +1,13 @@
package io.neoterm.component.config.loader package io.neoterm.component.config.loaders
import io.neoterm.component.config.IConfigureFileLoader import io.neoterm.component.config.IConfigureLoader
import io.neoterm.frontend.config.NeoConfigureFile import io.neoterm.frontend.config.NeoConfigureFile
import java.io.File import java.io.File
/** /**
* @author kiva * @author kiva
*/ */
class NeoLangConfigureLoader(val configFile: File) : IConfigureFileLoader { class NeoLangConfigureLoader(private val configFile: File) : IConfigureLoader {
override fun loadConfigure(): NeoConfigureFile? { override fun loadConfigure(): NeoConfigureFile? {
val configureFile = NeoConfigureFile(configFile) val configureFile = NeoConfigureFile(configFile)
return if (configureFile.parseConfigure()) configureFile else null return if (configureFile.parseConfigure()) configureFile else null

2
app/src/main/java/io/neoterm/component/config/loader/OldColorSchemeConfigureFile.kt → app/src/main/java/io/neoterm/component/config/loaders/OldColorSchemeConfigureFile.kt
View File

@ -1,4 +1,4 @@
package io.neoterm.component.config.loader package io.neoterm.component.config.loaders
import io.neolang.runtime.type.NeoLangValue import io.neolang.runtime.type.NeoLangValue
import io.neoterm.component.color.NeoColorScheme import io.neoterm.component.color.NeoColorScheme

6
app/src/main/java/io/neoterm/component/config/loader/OldConfigureLoader.kt → app/src/main/java/io/neoterm/component/config/loaders/OldConfigureLoader.kt
View File

@ -1,13 +1,13 @@
package io.neoterm.component.config.loader package io.neoterm.component.config.loaders
import io.neoterm.component.config.IConfigureFileLoader import io.neoterm.component.config.IConfigureLoader
import io.neoterm.frontend.config.NeoConfigureFile import io.neoterm.frontend.config.NeoConfigureFile
import java.io.File import java.io.File
/** /**
* @author kiva * @author kiva
*/ */
class OldConfigureLoader(val configFile: File) : IConfigureFileLoader { class OldConfigureLoader(private val configFile: File) : IConfigureLoader {
override fun loadConfigure(): NeoConfigureFile? { override fun loadConfigure(): NeoConfigureFile? {
return when (configFile.extension) { return when (configFile.extension) {
"eks" -> returnConfigure(OldExtraKeysConfigureFile(configFile)) "eks" -> returnConfigure(OldExtraKeysConfigureFile(configFile))

2
app/src/main/java/io/neoterm/component/config/loader/OldExtraKeysConfigureFile.kt → app/src/main/java/io/neoterm/component/config/loaders/OldExtraKeysConfigureFile.kt
View File

@ -1,4 +1,4 @@
package io.neoterm.component.config.loader package io.neoterm.component.config.loaders
import io.neolang.runtime.type.NeoLangValue import io.neolang.runtime.type.NeoLangValue
import io.neolang.visitor.ConfigVisitor import io.neolang.visitor.ConfigVisitor

6
app/src/main/java/io/neoterm/component/profile/NeoProfile.kt Normal file
View File

@ -0,0 +1,6 @@
package io.neoterm.component.profile
/**
* @author kiva
*/
abstract class NeoProfile

3
app/src/main/java/io/neoterm/frontend/session/shell/ShellProfile.kt
View File

@ -2,6 +2,7 @@ package io.neoterm.frontend.session.shell
import io.neoterm.component.color.ColorSchemeComponent import io.neoterm.component.color.ColorSchemeComponent
import io.neoterm.component.font.FontComponent import io.neoterm.component.font.FontComponent
import io.neoterm.component.profile.NeoProfile
import io.neoterm.frontend.component.ComponentManager import io.neoterm.frontend.component.ComponentManager
import io.neoterm.frontend.config.DefaultValues import io.neoterm.frontend.config.DefaultValues
import io.neoterm.frontend.config.NeoPreference import io.neoterm.frontend.config.NeoPreference
@ -9,7 +10,7 @@ import io.neoterm.frontend.config.NeoPreference
/** /**
* @author kiva * @author kiva
*/ */
class ShellProfile { class ShellProfile : NeoProfile() {
var loginShell = DefaultValues.loginShell var loginShell = DefaultValues.loginShell
var initialCommand = DefaultValues.initialCommand var initialCommand = DefaultValues.initialCommand