diff --git a/src/main/kotlin/de/idetools/filename_template/InitializeFilenameTemplateActivity.kt b/src/main/kotlin/de/idetools/filename_template/InitializeFilenameTemplateActivity.kt index 0a515ed..e46e62d 100644 --- a/src/main/kotlin/de/idetools/filename_template/InitializeFilenameTemplateActivity.kt +++ b/src/main/kotlin/de/idetools/filename_template/InitializeFilenameTemplateActivity.kt @@ -25,7 +25,7 @@ class InitializeFilenameTemplateActivity : StartupActivity { } var anchorId = "NewFile" - settings.filenameTemplates.forEach { + settings.filenameTemplates.filter { it.isActive }.forEach { val action = CreateFileWithFilenameTemplateAction( it.text, it.description, diff --git a/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateConfigurable.kt b/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateConfigurable.kt index 38c1025..5d8ae25 100644 --- a/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateConfigurable.kt +++ b/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateConfigurable.kt @@ -13,7 +13,7 @@ class FilenameTemplateConfigurable : Configurable { init { val settings: FilenameTemplateSettingsState = FilenameTemplateSettingsState.instance component = FilenameTemplateSettingsComponent(ArrayList(settings.filenameTemplates.map { - FilenameTemplateModel(it.text, it.description, it.template) + FilenameTemplateModel(it.isActive, it.text, it.description, it.template) })) } @@ -31,9 +31,10 @@ class FilenameTemplateConfigurable : Configurable { return settings.filenameTemplates.size != component.filenameTemplates.size || settings.filenameTemplates.withIndex().any { - component.filenameTemplateTable.getValueAt(it.index, 0) != it.value.text - || component.filenameTemplateTable.getValueAt(it.index, 1) != it.value.description - || component.filenameTemplateTable.getValueAt(it.index, 2) != it.value.template + component.filenameTemplateTable.getValueAt(it.index, 0) != it.value.isActive + || component.filenameTemplateTable.getValueAt(it.index, 1) != it.value.text + || component.filenameTemplateTable.getValueAt(it.index, 2) != it.value.description + || component.filenameTemplateTable.getValueAt(it.index, 3) != it.value.template } } @@ -43,6 +44,7 @@ class FilenameTemplateConfigurable : Configurable { settings.filenameTemplates.clear() settings.filenameTemplates.addAll(component.filenameTemplates.map { FilenameTemplateModel( + it.isActive, it.text, it.description, it.template @@ -56,6 +58,7 @@ class FilenameTemplateConfigurable : Configurable { component.filenameTemplates.clear() component.filenameTemplates.addAll(settings.filenameTemplates.map { FilenameTemplateModel( + it.isActive, it.text, it.description, it.template diff --git a/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateModel.kt b/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateModel.kt index 17df57b..86f7101 100644 --- a/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateModel.kt +++ b/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateModel.kt @@ -1,6 +1,7 @@ package de.idetools.filename_template.settings data class FilenameTemplateModel( + var isActive: Boolean = false, var text: String = "", var description: String = "", var template: String = "" diff --git a/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateTableModel.kt b/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateTableModel.kt index 4cdb358..7bc7b76 100644 --- a/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateTableModel.kt +++ b/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateTableModel.kt @@ -5,7 +5,7 @@ import javax.swing.table.AbstractTableModel class FilenameTemplateTableModel(private val filenameTemplates: ArrayList) : AbstractTableModel() { - private val header: List = listOf("Text", "Description", "Template") + private val header: List = listOf("Active", "Text", "Description", "Template") override fun getRowCount(): Int = filenameTemplates.size @@ -13,18 +13,20 @@ class FilenameTemplateTableModel(private val filenameTemplates: ArrayList filenameTemplates[row].text - 1 -> filenameTemplates[row].description - 2 -> filenameTemplates[row].template + 0 -> filenameTemplates[row].isActive + 1 -> filenameTemplates[row].text + 2 -> filenameTemplates[row].description + 3 -> filenameTemplates[row].template else -> throw ArrayIndexOutOfBoundsException() } } override fun setValueAt(value: Any?, row: Int, column: Int) { when (column) { - 0 -> filenameTemplates[row].text = value as String - 1 -> filenameTemplates[row].description = value as String - 2 -> filenameTemplates[row].template = value as String + 0 -> filenameTemplates[row].isActive = value as Boolean + 1 -> filenameTemplates[row].text = value as String + 2 -> filenameTemplates[row].description = value as String + 3 -> filenameTemplates[row].template = value as String else -> throw ArrayIndexOutOfBoundsException() } }