Skip to content

Commit ce7d16b

Browse files
dengziidengzii
committed
fix: compatible to IDEA 19.
1 parent 834329a commit ce7d16b

7 files changed

Lines changed: 67 additions & 65 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class FileWriteCommand(private var kit: PluginKit, private var module: Module) :
4444
failedList.addAll(createFileTree(it, current))
4545
}
4646
if (failedList.isNotEmpty()) {
47-
val msg = failedList.joinToString { it.getRealName() + "\n" }
47+
val msg = failedList.joinToString("\n") { it.getRealName() }
4848
NotificationUtils.showError(msg, "The following file creation failed.")
4949
}
5050
}

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.intellij.icons.AllIcons
44
import com.intellij.ide.fileTemplates.FileTemplateDescriptor
55
import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptor
66
import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptorFactory
7-
import com.intellij.openapi.fileTypes.StdFileTypes
7+
import com.intellij.openapi.fileTypes.FileTypeManager
88
import javax.swing.Icon
99

1010

@@ -23,14 +23,17 @@ class FileTemplateFactory : FileTemplateGroupDescriptorFactory {
2323

2424
val descriptor = FileTemplateGroupDescriptor("Module Template Plugin Descriptor", AllIcons.Nodes.Plugin)
2525

26-
descriptor.addTemplate(getDescriptor("MainActivity", StdFileTypes.JAVA.icon))
27-
descriptor.addTemplate(getDescriptor("Manifest.xml", StdFileTypes.XML.icon))
28-
descriptor.addTemplate(getDescriptor("Application.java", StdFileTypes.JAVA.icon))
29-
descriptor.addTemplate(getDescriptor("build.gradle", StdFileTypes.PLAIN_TEXT.icon))
30-
26+
descriptor.addTemplate(getDescriptor("MainActivity.java", getFileIconByExt("java")))
27+
descriptor.addTemplate(getDescriptor("Manifest.xml", getFileIconByExt("xml")))
28+
descriptor.addTemplate(getDescriptor("Application.java", getFileIconByExt("java")))
29+
descriptor.addTemplate(getDescriptor("build.gradle", getFileIconByExt("gradle")))
3130
return descriptor
3231
}
3332

33+
private fun getFileIconByExt(ext: String): Icon {
34+
return FileTypeManager.getInstance().getFileTypeByExtension(ext).icon ?: AllIcons.FileTypes.Unknown
35+
}
36+
3437
private fun getDescriptor(templateName: String, icon: Icon?): FileTemplateDescriptor {
3538
return FileTemplateDescriptor(templateName, icon)
3639
}

‎src/com/dengzii/plugin/template/tools/NotificationUtils.kt‎

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

3-
import com.intellij.notification.*
3+
import com.intellij.notification.Notification
4+
import com.intellij.notification.NotificationType
5+
import com.intellij.notification.Notifications
46
import com.intellij.openapi.Disposable
57
import com.intellij.openapi.application.ApplicationManager
68
import com.intellij.openapi.project.Project
@@ -19,28 +21,30 @@ import com.intellij.util.Alarm
1921
object NotificationUtils {
2022

2123
var defaultTitle = "Notification"
24+
var defaultGroupId = "Untitled_Group"
2225

23-
var balloonGroup = NotificationGroup("Untitled_Notification", NotificationDisplayType.BALLOON, true)
24-
var stickyGroup = NotificationGroup("Untitled_Notification", NotificationDisplayType.STICKY_BALLOON, true)
25-
26-
fun getInfo(msg: String, title: String = defaultTitle): Notification {
27-
return balloonGroup.createNotification(NotificationType.INFORMATION).apply {
28-
setTitle(title)
29-
setContent(msg)
26+
fun getInfo(msg: String, title: String = defaultTitle, groupId: String = defaultGroupId): Notification {
27+
return Notification(groupId, null, NotificationType.INFORMATION).also {
28+
it.setContent(msg)
29+
it.setTitle(title)
30+
Notifications.Bus.notify(it, null)
3031
}
3132
}
3233

33-
fun getError(msg: String, title: String = defaultTitle): Notification {
34-
return stickyGroup.createNotification(NotificationType.ERROR).apply {
35-
setTitle(title)
36-
setContent(msg)
34+
fun getError(msg: String, title: String = defaultTitle, groupId: String = defaultGroupId): Notification {
35+
return Notification(groupId, null, NotificationType.ERROR).also {
36+
it.setContent(msg)
37+
it.setTitle(title)
38+
it.isImportant = true
39+
Notifications.Bus.notify(it, null)
3740
}
3841
}
3942

40-
fun getWarning(msg: String, title: String = defaultTitle): Notification {
41-
return balloonGroup.createNotification(NotificationType.WARNING).apply {
42-
setTitle(title)
43-
setContent(msg)
43+
fun getWarning(msg: String, title: String = defaultTitle, groupId: String = defaultGroupId): Notification {
44+
return Notification(groupId, null, NotificationType.WARNING).also {
45+
it.setContent(msg)
46+
it.setTitle(title)
47+
Notifications.Bus.notify(it, null)
4448
}
4549
}
4650

‎src/com/dengzii/plugin/template/tools/ui/ActionToolBarUtils.kt‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,38 @@ package com.dengzii.plugin.template.tools.ui
22

33
import com.intellij.openapi.actionSystem.AnAction
44
import com.intellij.openapi.actionSystem.AnActionEvent
5-
import com.intellij.openapi.actionSystem.DefaultActionGroup
6-
import com.intellij.openapi.actionSystem.Presentation
7-
import com.intellij.openapi.actionSystem.ex.ActionButtonLook
85
import com.intellij.openapi.actionSystem.impl.ActionButton
96
import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl
7+
import com.intellij.openapi.actionSystem.impl.PresentationFactory
108
import com.intellij.util.ui.JBUI
119
import java.awt.Dimension
10+
import java.awt.FlowLayout
1211
import javax.swing.Icon
12+
import javax.swing.JComponent
13+
import javax.swing.JPanel
1314

1415
object ActionToolBarUtils {
1516

16-
fun create(place: String, horizontal: Boolean = true, action: List<Action>): ActionToolbarImpl {
17-
val toolbarActionGroup = DefaultActionGroup(action)
18-
return object : ActionToolbarImpl(place, toolbarActionGroup, horizontal, false, true) {
19-
override fun createToolbarButton(action: AnAction, look: ActionButtonLook?, place: String,
20-
presentation: Presentation, minimumSize: Dimension): ActionButton {
21-
if (action is Action) {
22-
presentation.icon = action.icon
23-
presentation.isEnabled = action.isEnabled
24-
presentation.description = action.desc
25-
}
26-
val bt = super.createToolbarButton(action, look, place, presentation, minimumSize)
27-
bt.setIconInsets(JBUI.insets(0))
28-
return bt
17+
fun create(place: String, action: List<Action>): JComponent {
18+
19+
val panel = JPanel()
20+
panel.layout = FlowLayout().also {
21+
it.alignment = FlowLayout.LEFT
22+
it.hgap = 0
23+
it.vgap = 0
24+
}
25+
val factory = PresentationFactory()
26+
action.forEach {
27+
val presentation = factory.getPresentation(it).also { p ->
28+
p.icon = it.icon
29+
p.isEnabled = it.isEnabled
30+
p.description = it.desc
2931
}
32+
val bt = ActionButton(it, presentation, place, Dimension(22, 24))
33+
bt.setIconInsets(JBUI.insets(0))
34+
panel.add(bt)
3035
}
36+
return panel
3137
}
3238

3339
class Action(var icon: Icon,

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ package com.dengzii.plugin.template.ui
22

33
import com.dengzii.plugin.template.tools.ui.ActionToolBarUtils
44
import com.intellij.icons.AllIcons
5-
import com.intellij.openapi.actionSystem.ActionToolbar
6-
import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl
75
import com.intellij.ui.components.JBScrollPane
86
import com.intellij.ui.table.JBTable
97
import java.awt.BorderLayout
8+
import javax.swing.JComponent
109
import javax.swing.JPanel
1110
import javax.swing.event.TableModelEvent
1211
import javax.swing.table.DefaultTableModel
@@ -23,13 +22,13 @@ import javax.swing.table.DefaultTableModel
2322
class EditableTable(header: Array<String>, colEditable: Array<Boolean> = emptyArray()) : JPanel() {
2423

2524
private val scrollPanel = JBScrollPane()
26-
private val editToolbar:ActionToolbarImpl
25+
private val editToolbar: JComponent
2726
private val table = JBTable()
2827
private var tableModel = TableModel(header, colEditable)
2928

3029
init {
3130
layout = BorderLayout()
32-
editToolbar = ActionToolBarUtils.create("Edit1", true, listOf(
31+
editToolbar = ActionToolBarUtils.create("Edit1", listOf(
3332
ActionToolBarUtils.Action(AllIcons.General.Add) {
3433
tableModel.add()
3534
table.updateUI()

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

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ import com.dengzii.plugin.template.tools.ui.PopMenuUtils
66
import com.dengzii.plugin.template.tools.ui.onRightMouseButtonClicked
77
import com.dengzii.plugin.template.utils.Logger
88
import com.intellij.icons.AllIcons
9+
import com.intellij.openapi.fileTypes.FileTypeManager
910
import com.intellij.packageDependencies.ui.TreeModel
10-
import com.intellij.testFramework.createProjectAndUseInLoadComponentStateMode
1111
import com.intellij.ui.ColoredTreeCellRenderer
1212
import com.intellij.ui.components.JBScrollPane
1313
import com.intellij.ui.treeStructure.Tree
14-
import com.intellij.util.IconUtil
1514
import java.awt.BorderLayout
1615
import java.awt.event.*
1716
import java.util.*
@@ -28,7 +27,6 @@ class PreviewPanel : JPanel() {
2827
private var fileTree: Tree = Tree()
2928

3029
private lateinit var module: Module
31-
private val fileIconMap: MutableMap<String, Icon> = HashMap()
3230
private var replacePlaceholder = true
3331
private var onTreeUpdateListener: (() -> Unit)? = null
3432

@@ -38,19 +36,13 @@ class PreviewPanel : JPanel() {
3836
if (value is DefaultMutableTreeNode) {
3937
val node = value.userObject
4038
if (node is FileTreeNode) {
41-
icon = IconUtil.getAddClassIcon()
39+
icon = getIconByFileName(node.name)
4240
this.append(if (replacePlaceholder) node.getRealName() else node.name)
43-
if (node.isDir) {
44-
icon = AllIcons.Nodes.Package
41+
icon = if (node.isDir) {
42+
AllIcons.Nodes.Package
4543
} else {
46-
var suffix = ""
47-
if (node.name.contains(".")) {
48-
suffix = node.name.substring(node.name.lastIndexOf("."))
49-
}
50-
icon = fileIconMap.getOrDefault(suffix, AllIcons.FileTypes.Text)
44+
getIconByFileName(node.name)
5145
}
52-
} else {
53-
icon = AllIcons.FileTypes.Unknown
5446
}
5547
}
5648
}
@@ -96,16 +88,15 @@ class PreviewPanel : JPanel() {
9688
onTreeUpdateListener = listener
9789
}
9890

91+
private fun getIconByFileName(fileName: String): Icon {
92+
return FileTypeManager.getInstance().getFileTypeByExtension(fileName.split(".").last()).icon
93+
?: AllIcons.FileTypes.Text
94+
}
95+
9996
/**
10097
* init Tree icon, node title, mouse listener
10198
*/
10299
private fun initPanel() {
103-
fileIconMap[".java"] = AllIcons.Nodes.Class
104-
fileIconMap[".kt"] = AllIcons.Nodes.Class
105-
fileIconMap[".xml"] = AllIcons.FileTypes.Xml
106-
fileIconMap[".gradle"] = AllIcons.FileTypes.Config
107-
fileIconMap[".gitignore"] = AllIcons.FileTypes.Config
108-
fileIconMap[".pro"] = AllIcons.FileTypes.Config
109100
fileTree.onRightMouseButtonClicked { e ->
110101
val row = fileTree.getRowForLocation(e.x, e.y)
111102
if (row != -1) {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ import com.intellij.icons.AllIcons
1717
import com.intellij.openapi.fileChooser.FileChooser
1818
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
1919
import com.intellij.ui.DocumentAdapter
20-
import com.intellij.ui.table.TableView
2120
import java.awt.BorderLayout
22-
import java.awt.event.MouseEvent
2321
import java.io.*
2422
import java.util.*
2523
import java.util.function.Consumer
@@ -42,7 +40,7 @@ class RealConfigurePanel : ConfigurePanel() {
4240
private var modified = false
4341

4442
init {
45-
panelActionBar.add(ActionToolBarUtils.create("ActionBar1", true, listOf(
43+
panelActionBar.add(ActionToolBarUtils.create("ActionBar1", listOf(
4644
ActionToolBarUtils.Action(AllIcons.General.Add) {
4745
onAddConfig()
4846
},
@@ -170,6 +168,7 @@ class RealConfigurePanel : ConfigurePanel() {
170168
return
171169
}
172170
val newConfig = currentConfig!!.clone()
171+
newConfig.templateName = newConfig.templateName + "_Copy"
173172
configs!!.add(newConfig)
174173
templateListModel!!.addElement(newConfig.templateName)
175174
listTemplate.doLayout()

0 commit comments

Comments
 (0)