Skip to content

Commit af46c47

Browse files
dengziidengzii
committed
update: ui, file tree generation
1 parent 5b44535 commit af46c47

File tree

9 files changed

+152
-134
lines changed

9 files changed

+152
-134
lines changed

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

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.dengzii.plugin.template
22

33
import com.dengzii.plugin.template.model.FileTreeNode
44
import com.dengzii.plugin.template.model.Module
5+
import com.dengzii.plugin.template.tools.NotificationUtils
56
import com.dengzii.plugin.template.utils.Logger
67
import com.dengzii.plugin.template.utils.PluginKit
78
import com.intellij.openapi.command.UndoConfirmationPolicy
@@ -10,13 +11,9 @@ import com.intellij.openapi.vfs.VirtualFile
1011
import com.intellij.util.ThrowableRunnable
1112

1213
/**
13-
* <pre>
14-
* author : dengzi
15-
* e-mail : denua@foxmail.com
16-
* github : https://github.com/dengzii
17-
* time : 2019/12/31
18-
* desc :
19-
* </pre>
14+
* Create file tree.
15+
*
16+
* @author https://github.com/dengzii
2017
*/
2118
class FileWriteCommand(private var kit: PluginKit, private var module: Module) : ThrowableRunnable<Exception> {
2219

@@ -41,40 +38,52 @@ class FileWriteCommand(private var kit: PluginKit, private var module: Module) :
4138
Logger.d(TAG, "Placeholders : " + fileTreeNode.getPlaceholderInherit().toString())
4239
Logger.d(TAG, "FileTemplates : " + fileTreeNode.getFileTemplateInherit().toString())
4340
fileTreeNode.build()
41+
42+
val failedList = mutableListOf<FileTreeNode>()
4443
fileTreeNode.children.forEach {
45-
createFileTree(it, current)
44+
failedList.addAll(createFileTree(it, current))
45+
}
46+
if (failedList.isNotEmpty()) {
47+
val msg = failedList.joinToString { it.getRealName() + "\n" }
48+
NotificationUtils.showError(msg, "The following file creation failed.")
4649
}
4750
}
4851

49-
private fun createFileTree(treeNode: FileTreeNode, currentDirectory: VirtualFile) {
52+
private fun createFileTree(treeNode: FileTreeNode, currentDirectory: VirtualFile): List<FileTreeNode> {
5053
Logger.d(TAG, "create node $treeNode")
54+
val failedList = mutableListOf<FileTreeNode>()
5155
if (treeNode.isDir) {
56+
Logger.d(TAG, "create dir ${treeNode.getPath()}")
5257
val dir = kit.createDir(treeNode.getRealName(), currentDirectory)
5358
if (dir == null) {
59+
failedList.add(treeNode)
5460
Logger.e(TAG, "create directory failure: ${treeNode.getRealName()}")
55-
return
56-
}
57-
treeNode.children.forEach {
58-
createFileTree(it, dir)
59-
Logger.d(TAG, "create dir ${it.getPath()}")
61+
} else {
62+
treeNode.children.forEach {
63+
failedList.addAll(createFileTree(it, dir))
64+
}
6065
}
6166
} else {
6267
val template = treeNode.getTemplateFile()
63-
if (template != null) {
68+
if (template?.isNotBlank() == true) {
6469
val result = kit.createFileFromTemplate(
6570
treeNode.getRealName(),
6671
template,
6772
treeNode.getPlaceholderInherit().orEmpty(),
6873
currentDirectory)
69-
if (result == null) {
74+
if (result == null || !result.isValid) {
75+
failedList.add(treeNode)
7076
Logger.e(TAG, "create file from template failed, file: ${treeNode.getRealName()} template:$template")
7177
} else {
7278
Logger.d(TAG, "create file from template ${treeNode.getRealName()}")
7379
}
7480
} else {
75-
kit.createFile(treeNode.getRealName(), currentDirectory)
81+
if (!kit.createFile(treeNode.getRealName(), currentDirectory)) {
82+
failedList.add(treeNode)
83+
}
7684
Logger.d(TAG, "create file ${treeNode.getPath()}")
7785
}
7886
}
87+
return failedList
7988
}
8089
}

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ open class FileTreeNode() {
140140
}
141141
}
142142

143+
fun getPlaceholderInNodeName() = name.getPlaceholder()
144+
143145
fun removeAllTemplateInTree() {
144146
fileTemplates?.clear()
145147
template = null
@@ -479,9 +481,13 @@ open class FileTreeNode() {
479481

480482
protected fun String.getPlaceholder(): List<String> {
481483
val result = mutableListOf<String>()
482-
val nameMatcher = sPlaceholderPattern.matcher(this)
483-
while (nameMatcher.find()) {
484-
result.add(nameMatcher.group(1))
484+
try {
485+
val nameMatcher = sPlaceholderPattern.matcher(this)
486+
while (nameMatcher.find()) {
487+
result.add(nameMatcher.group(1))
488+
}
489+
} catch (e: Exception) {
490+
Logger.e("FileTreeNode", e)
485491
}
486492
return result
487493
}

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

Lines changed: 62 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -5,77 +5,36 @@
55
<xy x="48" y="54" width="888" height="631"/>
66
</constraints>
77
<properties/>
8-
<border type="empty">
8+
<border type="none">
99
<size top="10" left="10" bottom="10" right="10"/>
1010
</border>
1111
<children>
12-
<grid id="3ee62" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="0">
13-
<constraints border-constraint="North"/>
14-
<properties/>
15-
<border type="none"/>
16-
<children>
17-
<grid id="56dc8" binding="panelActionBar" layout-manager="BorderLayout" hgap="0" vgap="0">
18-
<constraints/>
19-
<properties/>
20-
<border type="none"/>
21-
<children/>
22-
</grid>
23-
<grid id="699a3" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
24-
<margin top="0" left="100" bottom="0" right="0"/>
25-
<constraints/>
26-
<properties/>
27-
<border type="none"/>
28-
<children>
29-
<component id="8b36d" class="javax.swing.JLabel">
30-
<constraints>
31-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
32-
</constraints>
33-
<properties>
34-
<text value="Name: "/>
35-
</properties>
36-
</component>
37-
<component id="bd16c" class="javax.swing.JTextField" binding="tfName">
38-
<constraints>
39-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
40-
<preferred-size width="150" height="-1"/>
41-
</grid>
42-
</constraints>
43-
<properties>
44-
<minimumSize width="180" height="30"/>
45-
</properties>
46-
</component>
47-
</children>
48-
</grid>
49-
<component id="d7b5e" class="javax.swing.JCheckBox" binding="cbPlaceholder">
50-
<constraints/>
51-
<properties>
52-
<selected value="true"/>
53-
<text value="replace placeholder"/>
54-
</properties>
55-
</component>
56-
</children>
57-
</grid>
58-
<grid id="e3588" layout-manager="BorderLayout" hgap="0" vgap="0">
12+
<grid id="e3588" layout-manager="BorderLayout" hgap="4" vgap="0">
5913
<constraints border-constraint="Center"/>
6014
<properties>
61-
<background color="-13355980"/>
15+
<background color="-12828863"/>
6216
</properties>
6317
<border type="none"/>
6418
<children>
65-
<grid id="6e9e7" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
66-
<margin top="6" left="6" bottom="6" right="0"/>
19+
<grid id="6e9e7" layout-manager="BorderLayout" hgap="0" vgap="0">
6720
<constraints border-constraint="West"/>
6821
<properties/>
69-
<border type="empty"/>
22+
<border type="none">
23+
<color color="-13487566"/>
24+
</border>
7025
<children>
26+
<grid id="56dc8" binding="panelActionBar" layout-manager="BorderLayout" hgap="0" vgap="0">
27+
<constraints border-constraint="North"/>
28+
<properties/>
29+
<border type="none"/>
30+
<children/>
31+
</grid>
7132
<scrollpane id="edd3e" class="com.intellij.ui.components.JBScrollPane">
72-
<constraints>
73-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
74-
</constraints>
33+
<constraints border-constraint="Center"/>
7534
<properties>
7635
<foreground color="-10197916"/>
7736
</properties>
78-
<border type="line">
37+
<border type="none">
7938
<title-color color="-10197916"/>
8039
<color color="-10197916"/>
8140
</border>
@@ -96,8 +55,9 @@
9655
<grid id="6f1c1" layout-manager="BorderLayout" hgap="0" vgap="0">
9756
<constraints border-constraint="Center"/>
9857
<properties/>
99-
<border type="empty">
58+
<border type="none">
10059
<size top="6" left="6" bottom="6" right="6"/>
60+
<color color="-13487566"/>
10161
</border>
10262
<children>
10363
<grid id="6d154" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -108,17 +68,19 @@
10868
<children>
10969
<tabbedpane id="e9ea8" class="com.intellij.ui.components.JBTabbedPane" binding="tabbedPane">
11070
<constraints>
111-
<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"/>
71+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="4" hsize-policy="4" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
11272
</constraints>
113-
<properties/>
73+
<properties>
74+
<tabComponentInsets top="0" left="0" bottom="0" right="0"/>
75+
</properties>
11476
<border type="none"/>
11577
<children>
11678
<grid id="42887" binding="panelStructure" layout-manager="CardLayout" hgap="0" vgap="0">
11779
<constraints>
11880
<tabbedpane title="Structure"/>
11981
</constraints>
12082
<properties/>
121-
<border type="empty"/>
83+
<border type="none"/>
12284
<children/>
12385
</grid>
12486
<grid id="9bfd" binding="panelFileTemp" layout-manager="BorderLayout" hgap="0" vgap="0">
@@ -143,28 +105,50 @@
143105
</tabbedpane>
144106
</children>
145107
</grid>
108+
<grid id="3ee62" layout-manager="FlowLayout" hgap="5" vgap="5" flow-align="0">
109+
<constraints border-constraint="North"/>
110+
<properties/>
111+
<border type="none"/>
112+
<children>
113+
<grid id="699a3" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
114+
<margin top="0" left="10" bottom="0" right="0"/>
115+
<constraints/>
116+
<properties/>
117+
<border type="none"/>
118+
<children>
119+
<component id="8b36d" class="javax.swing.JLabel">
120+
<constraints>
121+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
122+
</constraints>
123+
<properties>
124+
<text value="Name: "/>
125+
</properties>
126+
</component>
127+
<component id="bd16c" class="javax.swing.JTextField" binding="tfName">
128+
<constraints>
129+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
130+
<preferred-size width="150" height="-1"/>
131+
</grid>
132+
</constraints>
133+
<properties>
134+
<minimumSize width="180" height="30"/>
135+
</properties>
136+
</component>
137+
</children>
138+
</grid>
139+
<component id="d7b5e" class="javax.swing.JCheckBox" binding="cbPlaceholder">
140+
<constraints/>
141+
<properties>
142+
<selected value="true"/>
143+
<text value="replace placeholder"/>
144+
</properties>
145+
</component>
146+
</children>
147+
</grid>
146148
</children>
147149
</grid>
148150
</children>
149151
</grid>
150-
<scrollpane id="96fb5">
151-
<constraints border-constraint="South"/>
152-
<properties/>
153-
<border type="empty"/>
154-
<children>
155-
<component id="184d" class="javax.swing.JLabel">
156-
<constraints/>
157-
<properties>
158-
<enabled value="true"/>
159-
<font size="11"/>
160-
<text value="&lt;html&gt;What is Auc? &lt;br&gt;&#10;Auc is the abbreviation of AndroidUtilCode, you can see github repo &lt;a href='https://github.com/Blankj/AucFrameTemplate'&gt;[Blankj/AucFrameTemplate]&lt;/a&gt; for more information.&lt;/html&gt;"/>
161-
</properties>
162-
<clientProperties>
163-
<html.disable class="java.lang.Boolean" value="false"/>
164-
</clientProperties>
165-
</component>
166-
</children>
167-
</scrollpane>
168152
</children>
169153
</grid>
170154
</form>

‎src/com/dengzii/plugin/template/ui/EditToolbar.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.dengzii.plugin.template.ui
22

33
import com.intellij.icons.AllIcons
4+
import com.intellij.openapi.actionSystem.ActionGroup
5+
import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl
46
import java.awt.Dimension
57
import java.awt.FlowLayout
68
import java.awt.event.ActionEvent

0 commit comments

Comments
 (0)