fix add config file template does not remove

Author: dengzi

src/com/dengzii/plugin/template/ui/ConfigurePanel.java

@@ -101,11 +101,11 @@ protected void textChanged(@NotNull DocumentEvent documentEvent) {
     }
 
     private void onAddConfig() {
-        currentConfig = Config.INSTANCE.getTEMPLATE_ANDROID_APPLICATION();
-        configs.add(currentConfig);
-        templateListModel.addElement(currentConfig.getTemplateName());
+        Module newConfig = Config.INSTANCE.getTEMPLATE_ANDROID_APPLICATION().clone();
+        configs.add(newConfig);
+        templateListModel.addElement(newConfig.getTemplateName());
         listTemplate.doLayout();
-        listTemplate.setSelectedIndex(configs.indexOf(currentConfig));
+        listTemplate.setSelectedIndex(configs.indexOf(newConfig));
     }
 
     private void onRemoveConfig() {
@@ -122,11 +122,11 @@ private void onCopyConfig() {
         if (noSelectedConfig()) {
             return;
         }
-        currentConfig = currentConfig.clone();
-        configs.add(currentConfig);
-        templateListModel.addElement(currentConfig.getTemplateName());
+        Module newConfig = currentConfig.clone();
+        configs.add(newConfig);
+        templateListModel.addElement(newConfig.getTemplateName());
         listTemplate.doLayout();
-        listTemplate.setSelectedIndex(configs.indexOf(currentConfig));
+        listTemplate.setSelectedIndex(configs.indexOf(newConfig));
     }
 
     private void loadConfig() {
@@ -144,14 +144,15 @@ private void onConfigSelect(int index) {
         }
         currentConfig = configs.get(index);
         tfName.setText(currentConfig.getTemplateName());
-        panelPreview.setModuleConfig(currentConfig);
 
-        // update file template and placeholder table
+        // update tree, file template and placeholder table
+        panelPreview.setModuleConfig(currentConfig);
         tableFileTemp.setPairData(currentConfig.getTemplate().getFileTemplates());
         tablePlaceholder.setPairData(currentConfig.getTemplate().getPlaceHolderMap());
     }
 
     private void cacheConfig() {
+        if (currentConfig == null) return;
         currentConfig.getTemplate().setFileTemplates(tableFileTemp.getPairResult());
         currentConfig.getTemplate().setPlaceHolderMap(tablePlaceholder.getPairResult());
     }

src/com/dengzii/plugin/template/ui/EditableTable.kt

@@ -15,12 +15,12 @@ import javax.swing.table.DefaultTableModel
  * desc   :
  * </pre>
  */
-class EditableTable(header: Array<String>) : JPanel() {
+class EditableTable(private val header: Array<String>) : JPanel() {
 
     private val scrollPanel = JBScrollPane()
     private val editToolbar = EditToolbar()
     private val table = JBTable()
-    private val tableModel = TableModel(header)
+    private var tableModel = TableModel(header)
 
     init {
         layout = BorderLayout()
@@ -37,6 +37,7 @@ class EditableTable(header: Array<String>) : JPanel() {
 
     fun setData(data: MutableList<MutableList<String>>) {
         tableModel.setData(data)
+        tableModel.fireTableDataChanged()
         table.updateUI()
     }
 
@@ -46,7 +47,6 @@ class EditableTable(header: Array<String>) : JPanel() {
             dataList.add(mutableListOf(t, u))
         }
         tableModel.setData(dataList)
-        scrollPanel.updateUI()
         tableModel.fireTableDataChanged()
         table.updateUI()
     }
@@ -89,17 +89,15 @@ class EditableTable(header: Array<String>) : JPanel() {
     internal class TableModel(private val header: Array<String>) : DefaultTableModel() {
 
         fun setData(fileTemp: MutableList<MutableList<String>>?) {
-            if (fileTemp == null) {
-                return
-            }
             while (rowCount > 0) {
                 removeRow(0)
             }
-            fireTableDataChanged()
+            if (fileTemp == null) {
+                return
+            }
             fileTemp.forEach {
                 addRow(it.toTypedArray())
             }
-            fireTableDataChanged()
         }
 
         fun add() {