From 9c6c811eecabae730bfa22dfd236d96610dff3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=B8=87=E7=A8=8B?= <1498425439@qq.com>
Date: Sun, 11 Dec 2022 22:09:44 +0800
Subject: [PATCH] =?UTF-8?q?2.07=20global-setting=20reset=20default=20|=20?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=AE=BE=E7=BD=AE=20=20=20=E5=A4=8D=E4=BD=8D?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=20fixed=20#19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                       | 17 ++++++++++++++++-
 build.gradle                                    |  4 +++-
 .../show/java/line/OwnerToPsiDocSkip.java       |  1 +
 .../plugin/show/java/line/SkipUtils.java        |  1 +
 .../plugin/show/lang/base/DocFilter.java        |  2 +-
 .../show/settings/AppSettingsComponent.java     |  3 +++
 .../show/settings/AppSettingsConfigurable.java  |  4 ++++
 .../plugin/show/settings/AppSettingsState.java  |  2 ++
 src/main/resources/META-INF/plugin.xml          | 15 ++++++++++++++-
 9 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9369f33..fb5aa55 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,11 @@ Show doc comment at the Project view Tree, line End, json etc.
 <li>The tsv conf file must could be search in "Go to File"(Ctrl + Shift + N)
 </ul>
 
+<h2>My Other Project</h2>
+<ul>
+<li>Find author/comment of multiple files or lines and export Find:
+<a href="https://plugins.jetbrains.com/plugin/20557-find-author">Find Author</a>
+</ul>
 
 <h2>中文说明:</h2>
 <ul>
@@ -58,9 +63,17 @@ Show doc comment at the Project view Tree, line End, json etc.
 <li>tsv 配置文件必须能被搜索(Ctrl + Shift + N)
 </ul>
 
+<h2>我的其他项目</h2>
+<ul>
+<li>查找多个文件或行的作者与导出搜索：
+<a href="https://plugins.jetbrains.com/plugin/20557-find-author">Find Author</a>
+</ul>
+
+<hr>
+
 如果对你有所帮助，别忘了给本项目
 <a href="https://github.com/LinWanCen/show-comment">GitHub</a>
-主页一个 Start，您的支持是项目前进的动力。
+主页一个 Star，您的支持是项目前进的动力。
 
 
 
@@ -68,6 +81,7 @@ Show doc comment at the Project view Tree, line End, json etc.
 
 <h2>English Change Notes:</h2>
 <ul>
+<li>2.07  Add global-setting    reset default
 <li>2.06  Add project-view-tree xx-abc.xxx from Abc.java doc
 <li>2.05  Add line-end-comment  json doc from xxx.json.tsv
 <li>2.04  Add line-end-comment  json dict doc from (key).tsv
@@ -103,6 +117,7 @@ Show doc comment at the Project view Tree, line End, json etc.
 
 <h2>中文更新说明:</h2>
 <ul>
+<li>2.07  增加 全局设置   复位默认值
 <li>2.06  增加 文件树注释  xx-abc.xxx 来自 Abc.java 的文档注释
 <li>2.05  增加 行末注释   json 字段注释从 xxx.json.tsv 读取
 <li>2.04  增加 行末注释   json 字典注释从 键名.tsv 读取
diff --git a/build.gradle b/build.gradle
index 85c305f..d022595 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'io.github.linwancen'
-version '2.06.0.' + (new Date().format('yyyy.MM.dd_HH.mm'))
+version '2.07.0.' + (new Date().format('yyyy.MM.dd_HH.mm'))
 
 repositories {
     mavenCentral()
@@ -87,6 +87,7 @@ patchPluginXml {
     changeNotes = """
 <h2>English Change Notes:</h2>
 <ul>
+<li>2.07  Add global-setting    reset default
 <li>2.06  Add project-view-tree xx-abc.xxx from Abc.java doc
 <li>2.05  Add line-end-comment  json doc from xxx.json.tsv
 <li>2.04  Add line-end-comment  json dict doc from (key).tsv
@@ -122,6 +123,7 @@ patchPluginXml {
 
 <h2>中文更新说明:</h2>
 <ul>
+<li>2.07  增加 全局设置   复位默认值
 <li>2.06  增加 文件树注释  xx-abc.xxx 来自 Abc.java 的文档注释
 <li>2.05  增加 行末注释   json 字段注释从 xxx.json.tsv 读取
 <li>2.04  增加 行末注释   json 字典注释从 键名.tsv 读取
diff --git a/src/main/idea/io/github/linwancen/plugin/show/java/line/OwnerToPsiDocSkip.java b/src/main/idea/io/github/linwancen/plugin/show/java/line/OwnerToPsiDocSkip.java
index 6a046a7..9386840 100644
--- a/src/main/idea/io/github/linwancen/plugin/show/java/line/OwnerToPsiDocSkip.java
+++ b/src/main/idea/io/github/linwancen/plugin/show/java/line/OwnerToPsiDocSkip.java
@@ -15,6 +15,7 @@ public class OwnerToPsiDocSkip {
 
     private OwnerToPsiDocSkip() {}
 
+    @Nullable
     public static <T extends SettingsInfo> PsiDocComment refDoc(@NotNull T settingsInfo,
                                                                 @Nullable PsiDocCommentOwner docOwner) {
         if (docOwner == null) {
diff --git a/src/main/idea/io/github/linwancen/plugin/show/java/line/SkipUtils.java b/src/main/idea/io/github/linwancen/plugin/show/java/line/SkipUtils.java
index 6b260a9..ccf1981 100644
--- a/src/main/idea/io/github/linwancen/plugin/show/java/line/SkipUtils.java
+++ b/src/main/idea/io/github/linwancen/plugin/show/java/line/SkipUtils.java
@@ -52,6 +52,7 @@ class SkipUtils {
         return null;
     }
 
+    @Nullable
     static <T extends SettingsInfo> PsiDocComment skipDoc(@NotNull T settingsInfo, @Nullable PsiDocComment doc) {
         if (doc == null) {
             return null;
diff --git a/src/main/java/io/github/linwancen/plugin/show/lang/base/DocFilter.java b/src/main/java/io/github/linwancen/plugin/show/lang/base/DocFilter.java
index 088a7b3..d92d07c 100644
--- a/src/main/java/io/github/linwancen/plugin/show/lang/base/DocFilter.java
+++ b/src/main/java/io/github/linwancen/plugin/show/lang/base/DocFilter.java
@@ -36,7 +36,7 @@ public class DocFilter {
         String[] split = LINE_SEPARATOR_PATTERN.split(text);
         int lineCount = 0;
         @NotNull StringBuilder sb = new StringBuilder();
-        for (String s : split) {
+        for (@NotNull String s : split) {
             if (deletePrefix) {
                 s = DOC_PATTERN.matcher(s).replaceAll("");
             }
diff --git a/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsComponent.java b/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsComponent.java
index 811d8e0..4cdde7c 100644
--- a/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsComponent.java
+++ b/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsComponent.java
@@ -15,6 +15,7 @@ import java.awt.*;
 public class AppSettingsComponent extends AbstractSettingsComponent {
 
     private final JPanel myMainPanel;
+    private final JButton resetDefault = new JButton("Reset default ");
     private final JBCheckBox showTreeComment = new JBCheckBox("Show tree comment ");
     private final JBCheckBox compact = new JBCheckBox("compact ");
     private final JBTextField treeTags = new JBTextField();
@@ -41,10 +42,12 @@ public class AppSettingsComponent extends AbstractSettingsComponent {
 
     public AppSettingsComponent() {
         myMainPanel = FormBuilder.createFormBuilder()
+                .addComponent(resetDefault, 1)
                 .addComponent(showPanel(), 1)
                 .addComponent(lineEndFilterPanel(), 1)
                 .addComponentFillVertically(new JPanel(), 0)
                 .getPanel();
+        resetDefault.addActionListener(e -> AppSettingsConfigurable.reset(AppSettingsState.DEFAULT_SETTING, this));
     }
 
     @NotNull
diff --git a/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsConfigurable.java b/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsConfigurable.java
index 2e33452..8af7c38 100644
--- a/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsConfigurable.java
+++ b/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsConfigurable.java
@@ -109,6 +109,10 @@ public class AppSettingsConfigurable implements Configurable {
     @Override
     public void reset() {
         @NotNull AppSettingsState settings = AppSettingsState.getInstance();
+        reset(settings, mySettingsComponent);
+    }
+
+    static void reset(@NotNull AppSettingsState settings, AppSettingsComponent mySettingsComponent) {
         mySettingsComponent.setShowTreeComment(settings.showTreeComment);
         mySettingsComponent.setCompact(settings.compact);
 
diff --git a/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsState.java b/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsState.java
index 309a70f..49e6419 100644
--- a/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsState.java
+++ b/src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsState.java
@@ -21,6 +21,8 @@ import java.util.Locale;
 )
 public class AppSettingsState extends AbstractSettingsState implements PersistentStateComponent<AppSettingsState> {
 
+    public static final AppSettingsState DEFAULT_SETTING = new AppSettingsState();
+
     public boolean showTreeComment = true;
     public boolean compact = true;
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 21fc398..9e96bcf 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -27,6 +27,11 @@ Show doc comment at the Project view Tree, line End, json etc.
 <li>The tsv conf file must could be search in "Go to File"(Ctrl + Shift + N)
 </ul>
 
+<h2>My Other Project</h2>
+<ul>
+<li>Find author/comment of multiple files or lines and export Find:
+<a href="https://plugins.jetbrains.com/plugin/20557-find-author">Find Author</a>
+</ul>
 
 <h2>中文说明:</h2>
 <ul>
@@ -54,9 +59,17 @@ Show doc comment at the Project view Tree, line End, json etc.
 <li>tsv 配置文件必须能被搜索(Ctrl + Shift + N)
 </ul>
 
+<h2>我的其他项目</h2>
+<ul>
+<li>查找多个文件或行的作者与导出搜索：
+<a href="https://plugins.jetbrains.com/plugin/20557-find-author">Find Author</a>
+</ul>
+
+<hr>
+
 如果对你有所帮助，别忘了给本项目
 <a href="https://github.com/LinWanCen/show-comment">GitHub</a>
-主页一个 Start，您的支持是项目前进的动力。
+主页一个 Star，您的支持是项目前进的动力。
     ]]></description>
 
   <!-- please see https://plugins.jetbrains.com/docs/intellij/plugin-compatibility.html