Use name as filename template identifier

This commit is contained in:
Matthias Gugel 2020-12-13 19:59:33 +01:00
parent b33653ae22
commit dc97fcb6e3
4 changed files with 10 additions and 10 deletions

View File

@ -27,11 +27,11 @@ class InitializeFilenameTemplateActivity : StartupActivity {
var anchorId = "NewFile" var anchorId = "NewFile"
settings.filenameTemplates.filter { it.isActive }.forEach { settings.filenameTemplates.filter { it.isActive }.forEach {
val action = CreateFileWithFilenameTemplateAction( val action = CreateFileWithFilenameTemplateAction(
it.text, it.name,
it.description, it.description,
it.template it.template
) )
val actionId = "FilenameTemplate.${it.text}" val actionId = "FilenameTemplate.${it.name}"
actionManager.registerAction(actionId, action) actionManager.registerAction(actionId, action)
newGroup.addAction(action, Constraints(Anchor.AFTER, anchorId)) newGroup.addAction(action, Constraints(Anchor.AFTER, anchorId))
anchorId = actionId anchorId = actionId

View File

@ -13,7 +13,7 @@ class FilenameTemplateConfigurable : Configurable {
init { init {
val settings: FilenameTemplateSettingsState = FilenameTemplateSettingsState.instance val settings: FilenameTemplateSettingsState = FilenameTemplateSettingsState.instance
component = FilenameTemplateSettingsComponent(ArrayList(settings.filenameTemplates.map { component = FilenameTemplateSettingsComponent(ArrayList(settings.filenameTemplates.map {
FilenameTemplateModel(it.isActive, it.text, it.description, it.template) FilenameTemplateModel(it.isActive, it.name, it.description, it.template)
})) }))
} }
@ -32,7 +32,7 @@ class FilenameTemplateConfigurable : Configurable {
return settings.filenameTemplates.size != component.filenameTemplates.size || return settings.filenameTemplates.size != component.filenameTemplates.size ||
settings.filenameTemplates.withIndex().any { settings.filenameTemplates.withIndex().any {
component.filenameTemplateTable.getValueAt(it.index, 0) != it.value.isActive component.filenameTemplateTable.getValueAt(it.index, 0) != it.value.isActive
|| component.filenameTemplateTable.getValueAt(it.index, 1) != it.value.text || component.filenameTemplateTable.getValueAt(it.index, 1) != it.value.name
|| component.filenameTemplateTable.getValueAt(it.index, 2) != it.value.description || component.filenameTemplateTable.getValueAt(it.index, 2) != it.value.description
|| component.filenameTemplateTable.getValueAt(it.index, 3) != it.value.template || component.filenameTemplateTable.getValueAt(it.index, 3) != it.value.template
} }
@ -45,7 +45,7 @@ class FilenameTemplateConfigurable : Configurable {
settings.filenameTemplates.addAll(component.filenameTemplates.map { settings.filenameTemplates.addAll(component.filenameTemplates.map {
FilenameTemplateModel( FilenameTemplateModel(
it.isActive, it.isActive,
it.text, it.name,
it.description, it.description,
it.template it.template
) )
@ -59,7 +59,7 @@ class FilenameTemplateConfigurable : Configurable {
component.filenameTemplates.addAll(settings.filenameTemplates.map { component.filenameTemplates.addAll(settings.filenameTemplates.map {
FilenameTemplateModel( FilenameTemplateModel(
it.isActive, it.isActive,
it.text, it.name,
it.description, it.description,
it.template it.template
) )

View File

@ -2,7 +2,7 @@ package de.idetools.filename_template.settings
data class FilenameTemplateModel( data class FilenameTemplateModel(
var isActive: Boolean = false, var isActive: Boolean = false,
var text: String = "", var name: String = "",
var description: String = "", var description: String = "",
var template: String = "" var template: String = ""
) )

View File

@ -5,7 +5,7 @@ import javax.swing.table.AbstractTableModel
class FilenameTemplateTableModel(private val filenameTemplates: ArrayList<FilenameTemplateModel>) : class FilenameTemplateTableModel(private val filenameTemplates: ArrayList<FilenameTemplateModel>) :
AbstractTableModel() { AbstractTableModel() {
private val header: List<String> = listOf("Active", "Text", "Description", "Template") private val header: List<String> = listOf("Active", "Name", "Description", "Template")
override fun getRowCount(): Int = filenameTemplates.size override fun getRowCount(): Int = filenameTemplates.size
@ -14,7 +14,7 @@ class FilenameTemplateTableModel(private val filenameTemplates: ArrayList<Filena
override fun getValueAt(row: Int, column: Int): Any { override fun getValueAt(row: Int, column: Int): Any {
return when (column) { return when (column) {
0 -> filenameTemplates[row].isActive 0 -> filenameTemplates[row].isActive
1 -> filenameTemplates[row].text 1 -> filenameTemplates[row].name
2 -> filenameTemplates[row].description 2 -> filenameTemplates[row].description
3 -> filenameTemplates[row].template 3 -> filenameTemplates[row].template
else -> throw ArrayIndexOutOfBoundsException() else -> throw ArrayIndexOutOfBoundsException()
@ -24,7 +24,7 @@ class FilenameTemplateTableModel(private val filenameTemplates: ArrayList<Filena
override fun setValueAt(value: Any?, row: Int, column: Int) { override fun setValueAt(value: Any?, row: Int, column: Int) {
when (column) { when (column) {
0 -> filenameTemplates[row].isActive = value as Boolean 0 -> filenameTemplates[row].isActive = value as Boolean
1 -> filenameTemplates[row].text = value as String 1 -> filenameTemplates[row].name = value as String
2 -> filenameTemplates[row].description = value as String 2 -> filenameTemplates[row].description = value as String
3 -> filenameTemplates[row].template = value as String 3 -> filenameTemplates[row].template = value as String
else -> throw ArrayIndexOutOfBoundsException() else -> throw ArrayIndexOutOfBoundsException()