optimize FileTreeNode placeholder

Author: dengzi

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

@@ -24,7 +24,7 @@ object Config {
     private const val KEY_TEMPLATES = "KEY_TEMPLATES"
     private const val KEY_INIT = "KEY_INIT"
 
-    private val GSON by lazy { GsonBuilder().setLenient().serializeNulls().create() }
+    private val GSON by lazy { GsonBuilder().setLenient().create() }
     private val STORE by lazy { PropertiesComponent.getInstance() }
 
     private val AUC_MODULE_TEMPLATES = listOf(

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

@@ -38,7 +38,7 @@ class FileWriteCommand(private var kit: PluginKit, private var module: Module) :
             return
         }
         val fileTreeNode = module.template
-        Logger.d(TAG, fileTreeNode.placeholders.toString())
+        Logger.d(TAG, fileTreeNode.getPlaceholderInherit().toString())
         fileTreeNode.children.forEach {
             createFileTree(it, current)
         }
@@ -60,7 +60,7 @@ class FileWriteCommand(private var kit: PluginKit, private var module: Module) :
                 val result = kit.createFileFromTemplate(
                         treeNode.getRealName(),
                         treeNode.getTemplateName()!!,
-                        treeNode.placeholders.orEmpty(),
+                        treeNode.getPlaceholderInherit().orEmpty(),
                         currentDirectory)
                 if (result == null) {
                     Logger.e(TAG, "create file from template failed, file: ${treeNode.getRealName()} template:${treeNode.getTemplateName()}")

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

@@ -29,14 +29,12 @@ open class FileTreeNode private constructor() {
         get() = realChildren
 
     var placeholders: MutableMap<String, String>? = null
-        get() = field ?: parent?.placeholders
 
     // template for node, higher priority than fileTemplates
-    var template: String? = null
+    private var template: String? = null
 
     // template of filename
     var fileTemplates: MutableMap<String, String>? = null
-        get() = field ?: parent?.fileTemplates
 
     private var realChildren = mutableSetOf<FileTreeNode>()
 
@@ -118,7 +116,15 @@ open class FileTreeNode private constructor() {
      * get the real name replace with placeholder
      */
     fun getRealName(): String {
-        return name.replacePlaceholder(placeholders)
+        return name.replacePlaceholder(getPlaceholderInherit())
+    }
+
+    fun getFileTemplateInherit(): MutableMap<String, String>? {
+        return fileTemplates ?: parent?.getFileTemplateInherit()
+    }
+
+    fun getPlaceholderInherit(): MutableMap<String, String>? {
+        return placeholders ?: parent?.getPlaceholderInherit()
     }
 
     fun fileTemplate(fileName: String, template: String) {
@@ -129,11 +135,11 @@ open class FileTreeNode private constructor() {
     }
 
     fun hasFileTemplate(): Boolean {
-        return template != null || fileTemplates?.containsKey(name) == true
+        return template != null || getFileTemplateInherit()?.containsKey(name) == true
     }
 
     fun getTemplateName(): String? {
-        return template ?: fileTemplates?.get(name)
+        return template ?: getFileTemplateInherit()?.get(name)
     }
 
     fun placeholder(name: String, value: String) {

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

@@ -104,7 +104,7 @@
                 <properties/>
                 <border type="none"/>
                 <children>
-                  <tabbedpane id="e9ea8" class="com.intellij.ui.components.JBTabbedPane">
+                  <tabbedpane id="e9ea8" class="com.intellij.ui.components.JBTabbedPane" binding="tabbedPane">
                     <constraints>
                       <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="4" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                     </constraints>

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

@@ -5,6 +5,7 @@
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.ui.components.JBList;
+import com.intellij.ui.components.JBTabbedPane;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -34,6 +35,7 @@ public class ConfigurePanel extends JPanel implements SearchableConfigurable {
     private JPanel panelFileTemp;
     private EditToolbar actionbar;
     private JCheckBox cbPlaceholder;
+    private JBTabbedPane tabbedPane;
 
     private List<Module> configs;
     private DefaultListModel<String> templateListModel;
@@ -84,6 +86,7 @@ private void initData() {
         cbPlaceholder.addChangeListener(e -> {
             panelPreview.setReplacePlaceholder(cbPlaceholder.isSelected());
         });
+        tabbedPane.addChangeListener(e -> onChangeTab());
         listTemplate.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         listTemplate.addListSelectionListener(e -> {
             if (noSelectedConfig()) return;
@@ -104,6 +107,13 @@ protected void textChanged(@NotNull DocumentEvent documentEvent) {
         }
     }
 
+    private void onChangeTab() {
+        if (0 == tabbedPane.getSelectedIndex()) {
+            currentConfig.getTemplate().setPlaceholders(tablePlaceholder.getPairResult());
+        }
+        panelPreview.setModuleConfig(currentConfig);
+    }
+
     private void onAddConfig() {
         Module newConfig = Config.INSTANCE.getTEMPLATE_ANDROID_APPLICATION().clone();
         configs.add(newConfig);

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

@@ -63,7 +63,7 @@ private void initDialog() {
         setLocation(x, y);
         setPreferredSize(new Dimension(w, h));
 
-        setTitle((isRename() ? "New " : "Rename ") + (isDir ? "Directory" : "File"));
+        setTitle((isRename() ? "Rename " : "New ") + (isDir ? "Directory" : "File"));
         if (isRename()) {
             textField1.setText(current.getRealName());
         }

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

@@ -85,6 +85,7 @@ public void setModuleConfig(Module module) {
 
         fileTree.setModel(getTreeModel(module.getTemplate()));
         fileTree.doLayout();
+        fileTree.updateUI();
         expandAll(fileTree, new TreePath(fileTree.getModel().getRoot()), true);
     }