fix: 修复settings 中的 Modified 和 rest 问题

Author: fulin

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

@@ -19,15 +19,17 @@
           <component id="f72e9" class="javax.swing.JTextField" binding="titleField">
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="100" height="-1"/>
+                <minimum-size width="100" height="-1"/>
+                <preferred-size width="200" height="-1"/>
               </grid>
             </constraints>
             <properties/>
           </component>
           <component id="7611f" class="javax.swing.JTextField" binding="descriptionField">
             <constraints>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                <preferred-size width="150" height="-1"/>
+                <minimum-size width="100" height="-1"/>
+                <preferred-size width="200" height="-1"/>
               </grid>
             </constraints>
             <properties/>

src/main/java/com/fulinlin/setting/ui/AliasEditor.form

@@ -8,6 +8,7 @@
 import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.editor.EditorSettings;
 import com.intellij.openapi.fileTypes.FileTypeManager;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.AnActionButton;
 import com.intellij.ui.DoubleClickListener;
 import com.intellij.ui.ToolbarDecorator;
@@ -34,7 +35,7 @@ public class TemplateEditPane {
 
     public TemplateEditPane(GitCommitMessageHelperSettings settings) {
         //get setting
-        this.settings = settings;
+        this.settings = settings.clone();
         aliasTable = new AliasTable();
         String template = Optional.of(settings.getDateSettings().getTemplate()).orElse("");
         //init  templateEditor
@@ -84,23 +85,27 @@ public GitCommitMessageHelperSettings getSettings() {
         return settings;
     }
 
-    public void reset() {
+    public void reset(GitCommitMessageHelperSettings settings) {
+        this.settings = settings;
+        aliasTable.reset(settings);
+        ApplicationManager.getApplication().runWriteAction(() -> templateEditor.getDocument().setText(settings.getDateSettings().getTemplate()));
 
     }
 
-//    public boolean isSettingsModified(GitCommitMessageHelperSettings settings) {
-//        if (aliasTable.isModified(settings)) return true;
-//        return !this.settings.equals(settings) || isModified(settings);
-//    }
 
-    public boolean isModified() {
-       /* if (!StringUtil.equals(settings.getDateSettings().getTemplate(), data.getDateSettings().getTemplate())) {
+    public boolean isSettingsModified(GitCommitMessageHelperSettings settings) {
+        if (aliasTable.isModified(settings)) return true;
+        return !this.settings.equals(settings) || isModified(settings);
+    }
+
+    public boolean isModified(GitCommitMessageHelperSettings data) {
+        if (!StringUtil.equals(settings.getDateSettings().getTemplate(), templateEditor.getDocument().getText())) {
             return true;
         }
         if (settings.getDateSettings().getTypeAliases() != data.getDateSettings().getTypeAliases()) {
             return true;
-        }*/
-        return true;
+        }
+        return false;
     }
 
 

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

@@ -11,7 +11,8 @@
 
 /**
  * 这个类Settings 中的属性被创建的时候
- * User: fulin
+ *
+ * @author: fulin
  */
 public class TemplateEditPaneConfigurable implements SearchableConfigurable {
 
@@ -55,18 +56,18 @@ public String getDisplayName() {
 
     public void reset() {
         if (templateEditPane != null) {
-            templateEditPane.reset();
+            templateEditPane.reset(settings);
         }
     }
 
     @Override
     public boolean isModified() {
-        return templateEditPane != null && templateEditPane.isModified();
+        return templateEditPane != null && templateEditPane.isSettingsModified(settings);
     }
 
 
     @Override
     public void apply() {
-        settings.setDateSettings(templateEditPane.getSettings().getDateSettings());
+        this.settings = templateEditPane.getSettings().clone();
     }
 }

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

@@ -1,15 +1,10 @@
 package com.fulinlin.ui;
 
-import com.fulinlin.model.ChangeType;
 import com.fulinlin.model.CommitTemplate;
 import com.fulinlin.model.TypeAlias;
 import com.fulinlin.storage.GitCommitMessageHelperSettings;
 import com.fulinlin.utils.VelocityUtils;
-import com.intellij.openapi.util.text.StringUtil;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.WordUtils;
-
-import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 /**
  * @author fulin

src/main/java/com/fulinlin/ui/CommitMessage.java

@@ -1,6 +1,5 @@
 package com.fulinlin.ui;
 
-import com.fulinlin.model.ChangeType;
 import com.fulinlin.model.TypeAlias;
 import com.fulinlin.storage.GitCommitMessageHelperSettings;
 import com.intellij.openapi.project.Project;