fix: ApacheVelocity not work, update ui

Author: dengzii

resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.dengzii.plugin.template</id>
     <name>Generate Module From Template</name>
-    <version>1.6.4</version>
+    <version>1.6.5</version>
     <vendor email="[email protected]" url="https://github.com/dengzii">dengzi</vendor>
 
     <description><![CDATA[
@@ -14,13 +14,14 @@
 2. Support placeholders / ApacheVelocity template lang in file name.<br>
 3. Specify file templates from IDE custom/build-in templates.<br>
 4. Passing placeholders to file template as variables.<br>
-5. Output/import template file. share your template with your partner.<br>
+5. Export / Import template, share template by file.<br>
 <br>
 <b>Usage</b><br>
 1. Configure template in plugin settings: <b>File > Settings > Tools > Module Template Settings</b>.<br>
 2. Create directories from the 'Structure' tab, click the right mouse button to operate the file tree.<br>
 3. FileTree can use placeholders or ApacheVelocity template lang, the placeholder should like this -> <b>${YOUR_PLACEHOLDER_HERE}</b>.<br>
-4. The 'File Template' tab lists which template the specified file uses, you can also use placeholders for FileName field.<br>
+4. The 'File Template' tab lists which template the specified file uses, you can also use placeholders for FileName field,
+    for same name file, you can use path to distinguish them, for example: c/x.js is match a/b/c/x.js<br>
 5. The 'Placeholder' tab's table defines placeholders for replacing filenames and file templates<br>
 More information: <a href='https://github.com/dengzii/GenerateModuleFromTemplate/blob/master/README.md'>README</a><br>
 <br>
@@ -42,6 +43,9 @@ Any question please <a href='https://github.com/dengzii/GenerateModuleFromTempla
     ]]></description>
 
     <change-notes><![CDATA[
+    <b>Version 1.6.5 (2023/12/11)</b><br>
+    1. Update: File template support match by file path.<br>
+    2. Fix: ApacheVelocity template lang not work.<br>
     <b>Version 1.6.4 (2023/07/06)</b><br>
     1. Feature: Support ApacheVelocity in file name.<br>
     <br>
@@ -54,7 +58,7 @@ Any question please <a href='https://github.com/dengzii/GenerateModuleFromTempla
     <depends>com.intellij.modules.lang</depends>
 
     <extensions defaultExtensionNs="com.intellij">
-        <fileTemplateGroup implementation="com.dengzii.plugin.template.template.FileTemplateFactory" order="first"/>
+<!--        <fileTemplateGroup implementation="com.dengzii.plugin.template.template.FileTemplateFactory" order="first"/>-->
         <applicationConfigurable groupId="tools" displayName="Module Template Settings"
                                  id="preferences.ModuleTemplateConfig"
                                  instance="com.dengzii.plugin.template.TemplateConfigurable"/>

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

@@ -51,6 +51,7 @@ class FileWriteCommand(private var kit: PluginKit, private var module: Module) :
                 }
             }
         }
+        fileTreeNode.context = context
 
         val failedList = mutableListOf<FileTreeNode>()
         fileTreeNode.children.forEach {

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

@@ -50,6 +50,9 @@ open class FileTreeNode() {
     @Transient
     private var module: Module? = null
 
+    @Transient
+    var context: VelocityContext? = null
+
     companion object {
 
         private val TAG = FileTreeNode::class.java.simpleName
@@ -148,7 +151,10 @@ open class FileTreeNode() {
         return getRealNameInternal(velocityContext, this.name)
     }
 
-    private fun getRealNameInternal(velocityContext: VelocityContext? = null, fileName: String = this.name): String {
+    private fun getRealNameInternal(
+        velocityContext: VelocityContext? = getContextInherit(),
+        fileName: String = this.name,
+    ): String {
         return if (isDir) {
             val rn = replacePlaceholder(velocityContext, fileName, getPlaceholderInherit(), false)
             if (getModuleInherit()?.lowercaseDir == true) rn.lowercase() else rn
@@ -197,6 +203,14 @@ open class FileTreeNode() {
         return nodes
     }
 
+    private fun getContextInherit(): VelocityContext? {
+        return if (context == null) {
+            parent?.getContextInherit()
+        } else {
+            context
+        }
+    }
+
     fun getFileTemplateInherit(): MutableMap<String, String>? {
         return if (fileTemplates.isNullOrEmpty()) {
             return parent?.getFileTemplateInherit()
@@ -216,7 +230,7 @@ open class FileTreeNode() {
     /**
      *  Resolve all file template file name in tree node.
      */
-    fun resolveFileTemplate(context: VelocityContext? = null) {
+    fun resolveFileTemplate(context: VelocityContext? = getContextInherit()) {
         val templates = getAllTemplateMap()
         val placeholders = getPlaceholderInherit() ?: return
         if (fileTemplates != null && templates.isNotEmpty()) {
@@ -227,7 +241,7 @@ open class FileTreeNode() {
             }
         }
         traversal({ it, _ ->
-            it.resolveFileTemplate()
+            it.resolveFileTemplate(context)
         })
     }
 

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

@@ -12,7 +12,7 @@ class Module(
     var lowercaseDir: Boolean = true,
     var capitalizeFile: Boolean = true,
     var packageNameToDir: Boolean = true,
-    var enableApacheVelocity: Boolean = false,
+    var enableApacheVelocity: Boolean = true,
 ) {
 
     companion object {

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

@@ -197,7 +197,7 @@
                     <constraints/>
                     <properties>
                       <selected value="false"/>
-                      <text value="Replace placeholder"/>
+                      <text value="Preview Mode"/>
                     </properties>
                   </component>
                   <component id="a98e" class="javax.swing.JCheckBox" binding="cbEnableVelocity">

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

@@ -40,16 +40,19 @@ class RealConfigurePanel : ConfigurePanel() {
 
     init {
         panelActionBar.add(ActionToolBarUtils.create("ActionBar1", listOf(
-            ActionToolBarUtils.Action(AllIcons.General.Add) {
+            ActionToolBarUtils.Action(AllIcons.General.Add, desc = "Create template") {
                 onAddConfig()
             },
-            ActionToolBarUtils.Action(AllIcons.General.Remove) {
+            ActionToolBarUtils.Action(AllIcons.General.Remove, desc = "Remove selected template") {
                 onRemoveConfig()
             },
-            ActionToolBarUtils.Action(AllIcons.General.CopyHovered) {
+            ActionToolBarUtils.Action(AllIcons.General.CopyHovered, desc = "Copy selected template") {
                 onCopyConfig()
             },
-            ActionToolBarUtils.Action(AllIcons.Actions.Download) {
+            ActionToolBarUtils.Action(AllIcons.ToolbarDecorator.Import, desc = "Import template from file") {
+                onImportTemplate()
+            },
+            ActionToolBarUtils.Action(AllIcons.Actions.MenuSaveall, desc = "Export selected template") {
                 onExportTemplate()
             }
         )))
@@ -234,7 +237,6 @@ class RealConfigurePanel : ConfigurePanel() {
     private fun onAddConfig() {
         PopMenuUtils.create(linkedMapOf(
             "Empty Template" to { addModuleTemplate(getEmpty()) },
-            "* Import From File" to { onImportTemplate() },
             "Android Application" to { addModuleTemplate(getAndroidApplication()) },
             "Android Mvp" to { addModuleTemplate(getAndroidMvp()) },
             "Auc Module" to { addModuleTemplate(getAucModule()) },
@@ -246,7 +248,7 @@ class RealConfigurePanel : ConfigurePanel() {
 
     private fun onExportTemplate() {
         val descriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor()
-        descriptor.title = "Save Template to File"
+        descriptor.title = "Save template ${currentConfig!!.templateName} to File"
         val vf = FileChooser.chooseFile(descriptor, project, null)
         if (vf != null && vf.isWritable) {
             val config = GSON.toJson(currentConfig)