Skip to content

Commit 0d8df65

Browse files
author
fulin
committed
feat(settings): 绑定数据
1 parent 6427791 commit 0d8df65

File tree

14 files changed

+197
-125
lines changed

14 files changed

+197
-125
lines changed

src/main/java/com/fulinlin/action/CreateCommitAction.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.fulinlin.action;
22

3+
import com.fulinlin.storage.GitCommitMessageHelperSettings;
34
import com.fulinlin.ui.CommitDialog;
45
import com.intellij.openapi.actionSystem.AnAction;
56
import com.intellij.openapi.actionSystem.AnActionEvent;
7+
import com.intellij.openapi.components.ServiceManager;
68
import com.intellij.openapi.project.DumbAware;
79
import com.intellij.openapi.ui.DialogWrapper;
810
import com.intellij.openapi.vcs.CommitMessageI;
@@ -15,13 +17,19 @@
1517
*/
1618
public class CreateCommitAction extends AnAction implements DumbAware {
1719

20+
private GitCommitMessageHelperSettings settings;
21+
22+
public CreateCommitAction() {
23+
this.settings = ServiceManager.getService(GitCommitMessageHelperSettings.class);
24+
}
25+
1826
@Override
1927
public void actionPerformed(AnActionEvent actionEvent) {
2028
final CommitMessageI commitPanel = getCommitPanel(actionEvent);
2129
if (commitPanel == null) {
2230
return;
2331
}
24-
CommitDialog dialog = new CommitDialog(actionEvent.getProject());
32+
CommitDialog dialog = new CommitDialog(actionEvent.getProject(),settings);
2533
dialog.show();
2634
if (dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
2735
commitPanel.setCommitMessage(dialog.getCommitMessage().toString());

src/main/java/com/fulinlin/action/SettingAction.java

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.fulinlin.constant;
2+
3+
/**
4+
* @program: git-commit-message-helper
5+
* @author: fulin
6+
* @create: 2019-12-08 11:37
7+
**/
8+
public class GitCommitConstants {
9+
public static final String DEFAULT_TEMPLATE = "${type}(${scope}): ${subject}\n" +
10+
"\n" +
11+
"${body}\n" +
12+
"\n" +
13+
"BREAKING CHANGE: ${changes}\n" +
14+
"\n" +
15+
"Closes ${closes}\n";
16+
17+
}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
package com.fulinlin.model;
2+
3+
/**
4+
* @program: git-commit-message-helper
5+
* @author: fulin
6+
* @create: 2019-12-08 11:36
7+
**/
8+
public class CommitTemplate {
9+
10+
private String type;
11+
private String scope;
12+
private String subject;
13+
private String body;
14+
private String changes;
15+
private String closes;
16+
17+
public String getType() {
18+
return type;
19+
}
20+
21+
public void setType(String type) {
22+
this.type = type;
23+
}
24+
25+
public String getScope() {
26+
return scope;
27+
}
28+
29+
public void setScope(String scope) {
30+
this.scope = scope;
31+
}
32+
33+
public String getSubject() {
34+
return subject;
35+
}
36+
37+
public void setSubject(String subject) {
38+
this.subject = subject;
39+
}
40+
41+
public String getBody() {
42+
return body;
43+
}
44+
45+
public void setBody(String body) {
46+
this.body = body;
47+
}
48+
49+
public String getChanges() {
50+
return changes;
51+
}
52+
53+
public void setChanges(String changes) {
54+
this.changes = changes;
55+
}
56+
57+
public String getCloses() {
58+
return closes;
59+
}
60+
61+
public void setCloses(String closes) {
62+
this.closes = closes;
63+
}
64+
}

src/main/java/com/fulinlin/model/TemplateLanguage.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/main/java/com/fulinlin/model/TypeAlias.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,9 @@ public String getDescription() {
3232
public void setDescription(String description) {
3333
this.description = description;
3434
}
35+
36+
@Override
37+
public String toString() {
38+
return String.format("%s - %s", this.getTitle(), this.getDescription());
39+
}
3540
}

src/main/java/com/fulinlin/setting/ui/Editors.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/main/java/com/fulinlin/setting/ui/TemplateEdit.kt

Lines changed: 0 additions & 61 deletions
This file was deleted.

src/main/java/com/fulinlin/setting/ui/TemplateEditPane.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.fulinlin.setting.ui;
22

3-
import com.fulinlin.model.TemplateLanguage;
43
import com.fulinlin.storage.GitCommitMessageHelperSettings;
54
import com.intellij.icons.AllIcons;
65
import com.intellij.openapi.actionSystem.AnActionEvent;
76
import com.intellij.openapi.application.ApplicationManager;
87
import com.intellij.openapi.editor.Editor;
98
import com.intellij.openapi.editor.EditorFactory;
109
import com.intellij.openapi.editor.EditorSettings;
11-
import com.intellij.openapi.fileTypes.FileType;
1210
import com.intellij.openapi.fileTypes.FileTypeManager;
13-
import com.intellij.openapi.util.text.StringUtil;
1411
import com.intellij.ui.AnActionButton;
1512
import com.intellij.ui.DoubleClickListener;
1613
import com.intellij.ui.ToolbarDecorator;
@@ -112,9 +109,5 @@ public JPanel getMainPenel() {
112109
return mainPenel;
113110
}
114111

115-
public TemplateLanguage getTemplateLanguage() {
116-
return TemplateLanguage.valueOf(String.valueOf(TemplateLanguage.vm.fileType));
117-
}
118-
119112

120113
}

src/main/java/com/fulinlin/storage/GitCommitMessageHelperSettings.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.fulinlin.storage;
22

3+
import com.fulinlin.constant.GitCommitConstants;
34
import com.fulinlin.model.DataSettings;
45
import com.fulinlin.model.TypeAlias;
56
import com.intellij.openapi.components.PersistentStateComponent;
@@ -53,14 +54,7 @@ public void loadState(@NotNull GitCommitMessageHelperSettings gitCommitMessageHe
5354
private void loadDefaultSettings() {
5455
dataSettings = new DataSettings();
5556
try {
56-
String velocityTemplate = "${type}(${scopr}): ${subject}\n" +
57-
"\n" +
58-
"${body}\n" +
59-
"\n" +
60-
"BREAKING CHANGE: ${changes}\n" +
61-
"\n" +
62-
"Closes ${closes}\n";
63-
dataSettings.setTemplate(velocityTemplate);
57+
dataSettings.setTemplate(GitCommitConstants.DEFAULT_TEMPLATE);
6458
List<TypeAlias> typeAliases = new LinkedList<>();
6559
typeAliases.add(new TypeAlias("feature", "A new feature"));
6660
typeAliases.add(new TypeAlias("fix", "A bug fix"));

0 commit comments

Comments
 (0)