fix template persist problem

Author: dengzi

src/com/dengzii/plugin/template/Config.kt

@@ -29,6 +29,7 @@ object Config {
             Module.create(AucTemplate.EXPORT, "export", "com.example.feature", "Java", "Auc Export Module")
     )
 
+
     fun clear() {
         PropertiesComponent.getInstance().unsetValue(KEY_TEMPLATES)
     }
@@ -43,92 +44,35 @@ object Config {
         Logger.d(Config::class.java.simpleName, "loadModuleTemplates")
         arr.forEach {
             try {
-                result.add(Serializer.deserializeModuleTemplate(it))
+                val module = GSON.fromJson(it, Module::class.java)
+                setParent(module.template)
+                println(module.template.getTreeGraph())
+                result.add(module)
             } catch (e: Exception) {
                 clear()
                 e.printStackTrace()
                 return result
             }
         }
+        result.addAll(DEFAULT_MODULE_TEMPLATE)
         return result
     }
 
     fun saveModuleTemplates(templates: List<Module>) {
         val t = mutableListOf<String>()
         templates.forEach {
-            t.add(Serializer.serializeModuleTemplate(it))
+            t.add(GSON.toJson(it))
             Logger.d(Config::class.java.simpleName, "saveModuleTemplates ${t[t.lastIndex]}")
         }
         PropertiesComponent.getInstance().setValues(KEY_TEMPLATES, t.toTypedArray())
     }
 
-
-    private object Serializer {
-
-        fun serializeModuleTemplate(module: Module): String {
-            val serialTreeNode = serializeTreeNode(module.template)
-            val result = SerialModule(serialTreeNode, module.name, module.packageName, module.language, module.templateName)
-            return GSON.toJson(result)
-        }
-
-        fun deserializeModuleTemplate(json: String): Module {
-            val serialModule = GSON.fromJson(json, SerialModule::class.java)
-            val fileTreeNode = deserializeTreeNode(serialModule.template)
-            return Module.create(fileTreeNode, serialModule.name, serialModule.packageName,
-                    serialModule.language, serialModule.templateName)
-        }
-
-        private fun deserializeTreeNode(treeNode: SerialTreeNode): FileTreeNode {
-            val fileTreeNode = FileTreeNode {
-                name = treeNode.name
-                isDir = treeNode.isDir
-                template = treeNode.template
-                fileTemplates = treeNode.fileTemplate
-                placeHolderMap = treeNode.placeholders
+    private fun setParent(node: FileTreeNode) {
+        node.children.forEach {
+            it.parent = node
+            if (it.isDir) {
+                setParent(it)
             }
-            if (treeNode.isDir) {
-                treeNode.children?.forEach {
-                    val node = deserializeTreeNode(it)
-                    node.parent = fileTreeNode
-                    fileTreeNode.children.add(node)
-                }
-            }
-            return fileTreeNode
-        }
-
-        private fun serializeTreeNode(treeNode: FileTreeNode): SerialTreeNode {
-            val serialTreeNode = SerialTreeNode(
-                    treeNode.getRealName(),
-                    treeNode.isDir,
-                    null,
-                    treeNode.template,
-                    treeNode.placeHolderMap,
-                    treeNode.fileTemplates
-            )
-            if (treeNode.isDir && treeNode.children.isNotEmpty()) {
-                serialTreeNode.children = mutableListOf()
-                treeNode.children.forEach {
-                    serialTreeNode.children?.add(serializeTreeNode(it))
-                }
-            }
-            return serialTreeNode
         }
-
-        private class SerialModule(
-                var template: SerialTreeNode,
-                var name: String,
-                var packageName: String,
-                var language: String,
-                var templateName: String
-        )
-
-        private class SerialTreeNode(
-                var name: String,
-                var isDir: Boolean,
-                var children: MutableList<SerialTreeNode>?,
-                var template: String?,
-                var placeholders: MutableMap<String, String>?,
-                var fileTemplate: MutableMap<String, String>?
-        )
     }
 }

src/com/dengzii/plugin/template/model/FileTreeNode.kt

@@ -23,7 +23,7 @@ open class FileTreeNode private constructor() {
         }
 
     var isDir = true
-    val children by lazy { mutableListOf<FileTreeNode>() }
+    var children = mutableListOf<FileTreeNode>()
     var placeHolderMap: MutableMap<String, String>? = null
         get() = field ?: parent?.placeHolderMap
 
@@ -36,6 +36,7 @@ open class FileTreeNode private constructor() {
 
     // the origin name with original placeholder
     private var realName: String = ""
+    @Transient
     var parent: FileTreeNode? = null
 
     companion object {

src/com/dengzii/plugin/template/template/AucTemplate.kt

@@ -43,7 +43,6 @@ object AucTemplate {
     }
 
     val APP = (BASE.clone()) {
-        fileTemplates = aucFileTemplates()
         placeholder(Placeholder.PACKAGE_NAME, "com.example")
         placeholder(Placeholder.MODULE_NAME, "app")
 

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

@@ -42,6 +42,7 @@ public class ConfigurePanel extends JPanel implements SearchableConfigurable {
 
     private List<Module> configs;
     private DefaultListModel<String> model;
+
     private Module currentConfig;
 
     private ConfigurePanel panel;
@@ -54,7 +55,7 @@ private ConfigurePanel() {
 
     @Override
     public void apply() {
-        if (panel != null){
+        if (panel != null) {
             panel.apply();
             return;
         }
@@ -86,26 +87,32 @@ public String getDisplayName() {
     }
 
     private void onAdd() {
-        currentConfig = Module.Companion.create(AucTemplate.INSTANCE.getAPP(), "ModuleName", "com.example", "Java", "TemplateName");
+        currentConfig = Module.Companion.create(AucTemplate.INSTANCE.getPKG(), "ModuleName", "com.example", "Java", "TemplateName");
         configs.add(currentConfig);
         model.addElement(currentConfig.getTemplateName());
         listTemplate.doLayout();
-        listTemplate.updateUI();
         listTemplate.setSelectedIndex(configs.indexOf(currentConfig));
     }
 
     private void onRemove() {
-        if (listTemplate.getSelectedIndex() == -1) {
+        if (getSelectedIndex() == -1) {
             return;
         }
-        configs.remove(listTemplate.getSelectedIndex());
-        model.remove(listTemplate.getSelectedIndex());
+        int selectedIndex = getSelectedIndex();
+        configs.remove(selectedIndex);
+        model.remove(selectedIndex);
         listTemplate.doLayout();
-        listTemplate.updateUI();
     }
 
     private void onCopy() {
+        if (getSelectedIndex() == -1) {
+            return;
+        }
+        listTemplate.doLayout();
+    }
 
+    private int getSelectedIndex() {
+        return listTemplate.getSelectedIndex();
     }
 
     private void loadConfig() {
@@ -127,8 +134,10 @@ private void initPanel() {
         btAdd.addActionListener(e -> onAdd());
         btRemove.addActionListener(e -> onRemove());
 
+        listTemplate.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         listTemplate.addListSelectionListener(e -> {
-            currentConfig = configs.get(listTemplate.getSelectedIndex());
+            if (getSelectedIndex() == -1) return;
+            currentConfig = configs.get(getSelectedIndex());
             tfName.setText(currentConfig.getTemplateName());
         });
         tfName.getDocument().addDocumentListener(new DocumentAdapter() {

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

@@ -158,7 +158,7 @@ private void initDialog() {
 
     private void initData() {
 
-        moduleTemplates = Config.INSTANCE.getDEFAULT_MODULE_TEMPLATE();
+        moduleTemplates = Config.INSTANCE.loadModuleTemplates();
         List<String> temp = new ArrayList<>();
         moduleTemplates.forEach(i -> temp.add(i.getTemplateName()));
         cbModuleType.setModel(new DefaultComboBoxModel<>(temp.toArray()));

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

@@ -61,7 +61,10 @@ public void customizeCellRenderer(@NotNull JTree jTree, Object value, boolean b,
                         if (node.isDir()) {
                             setIcon(AllIcons.Nodes.Package);
                         } else {
-                            String suffix = node.getName().substring(node.getName().lastIndexOf("."));
+                            String suffix = "";
+                            if (node.getName().contains(".")){
+                                suffix = node.getName().substring(node.getName().lastIndexOf("."));
+                            }
                             setIcon(fileIconMap.getOrDefault(suffix, AllIcons.FileTypes.Text));
                         }
                     }