feat: 修复apply判断

Author: fulin

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

@@ -26,4 +26,6 @@ public List<TypeAlias> getTypeAliases() {
  public void setTypeAliases(List<TypeAlias> typeAliases) {
  this.typeAliases = typeAliases;
  }
+
+
 }

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

@@ -1,5 +1,6 @@
 package com.fulinlin.setting.ui;
 
+import com.fulinlin.model.TypeAlias;
 import com.fulinlin.storage.GitCommitMessageHelperSettings;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -18,6 +19,7 @@
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.MouseEvent;
+import java.util.List;
 import java.util.Optional;
 
 
@@ -94,14 +96,14 @@ public void reset(GitCommitMessageHelperSettings settings) {
 
  public boolean isSettingsModified(GitCommitMessageHelperSettings settings) {
  if (aliasTable.isModified(settings)) return true;
- return !this.settings.equals(settings) || isModified(settings);
+ return 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()) {
+ if (settings.getDateSettings().getTypeAliases() == data.getDateSettings().getTypeAliases()) {
  return true;
  }
  return false;

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

@@ -1,6 +1,8 @@
 package com.fulinlin.setting.ui;
 
+import com.fulinlin.GitCommitMessageHelper;
 import com.fulinlin.storage.GitCommitMessageHelperSettings;
+import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.options.SearchableConfigurable;
 import org.jetbrains.annotations.Nls;
@@ -20,6 +22,8 @@ public class TemplateEditPaneConfigurable implements SearchableConfigurable {
 
  private GitCommitMessageHelperSettings settings;
 
+
+
  public TemplateEditPaneConfigurable() {
  settings = ServiceManager.getService(GitCommitMessageHelperSettings.class);
  }