From dc97fcb6e3ec34947b64cf832a0a44fe416e12c1 Mon Sep 17 00:00:00 2001
From: Matthias Gugel <matthias.gugel@idetools.de>
Date: Sun, 13 Dec 2020 19:59:33 +0100
Subject: [PATCH] Use name as filename template identifier

---
 .../InitializeFilenameTemplateActivity.kt                 | 4 ++--
 .../settings/FilenameTemplateConfigurable.kt              | 8 ++++----
 .../filename_template/settings/FilenameTemplateModel.kt   | 2 +-
 .../settings/FilenameTemplateTableModel.kt                | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/kotlin/de/idetools/filename_template/InitializeFilenameTemplateActivity.kt b/src/main/kotlin/de/idetools/filename_template/InitializeFilenameTemplateActivity.kt
index e46e62d..cf08a3b 100644
--- a/src/main/kotlin/de/idetools/filename_template/InitializeFilenameTemplateActivity.kt
+++ b/src/main/kotlin/de/idetools/filename_template/InitializeFilenameTemplateActivity.kt
@@ -27,11 +27,11 @@ class InitializeFilenameTemplateActivity : StartupActivity {
         var anchorId = "NewFile"
         settings.filenameTemplates.filter { it.isActive }.forEach {
             val action = CreateFileWithFilenameTemplateAction(
-                it.text,
+                it.name,
                 it.description,
                 it.template
             )
-            val actionId = "FilenameTemplate.${it.text}"
+            val actionId = "FilenameTemplate.${it.name}"
             actionManager.registerAction(actionId, action)
             newGroup.addAction(action, Constraints(Anchor.AFTER, anchorId))
             anchorId = actionId
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 650cc69..9c62ae4 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.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 ||
                 settings.filenameTemplates.withIndex().any {
                     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, 3) != it.value.template
                 }
@@ -45,7 +45,7 @@ class FilenameTemplateConfigurable : Configurable {
         settings.filenameTemplates.addAll(component.filenameTemplates.map {
             FilenameTemplateModel(
                 it.isActive,
-                it.text,
+                it.name,
                 it.description,
                 it.template
             )
@@ -59,7 +59,7 @@ class FilenameTemplateConfigurable : Configurable {
         component.filenameTemplates.addAll(settings.filenameTemplates.map {
             FilenameTemplateModel(
                 it.isActive,
-                it.text,
+                it.name,
                 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 86f7101..0c52181 100644
--- a/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateModel.kt
+++ b/src/main/kotlin/de/idetools/filename_template/settings/FilenameTemplateModel.kt
@@ -2,7 +2,7 @@ package de.idetools.filename_template.settings
 
 data class FilenameTemplateModel(
     var isActive: Boolean = false,
-    var text: String = "",
+    var name: 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 7bc7b76..1fe84a0 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<FilenameTemplateModel>) :
     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
 
@@ -14,7 +14,7 @@ class FilenameTemplateTableModel(private val filenameTemplates: ArrayList<Filena
     override fun getValueAt(row: Int, column: Int): Any {
         return when (column) {
             0 -> filenameTemplates[row].isActive
-            1 -> filenameTemplates[row].text
+            1 -> filenameTemplates[row].name
             2 -> filenameTemplates[row].description
             3 -> filenameTemplates[row].template
             else -> throw ArrayIndexOutOfBoundsException()
@@ -24,7 +24,7 @@ class FilenameTemplateTableModel(private val filenameTemplates: ArrayList<Filena
     override fun setValueAt(value: Any?, row: Int, column: Int) {
         when (column) {
             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
             3 -> filenameTemplates[row].template = value as String
             else -> throw ArrayIndexOutOfBoundsException()