add changeNotes.html and description.html

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'cc.duduhuo'
-version = '0.0.1'
+version = '0.0.1-rc'
 def name = 'git-conflict'
 
 apply plugin: 'idea'
@@ -24,12 +24,13 @@ intellij {
     version = '2018.1.1'
     publish {
         pluginId name
-        apply from: "local.properties"
+        if (file("local.properties").exists()) {
+            apply from: "local.properties"
+        }
         intellij.updateSinceUntilBuild false
     }
 }
 patchPluginXml {
-    changeNotes """
-      Highlight <span style="font-weight:bold;"><em>git conflict</em></span> content and <em>fix</em> conflicts more conveniently.
-      """
+    pluginDescription(file("description.html").text)
+    changeNotes(file("changeNotes.html").text)
 }

changeNotes.html

@@ -0,0 +1,2 @@
+<h4>v0.0.1-rc</h4>
+<li>The first release.</li>

description.html

@@ -0,0 +1,2 @@
+Highlight <span style="font-weight:bold;"><em>git conflict</em></span> content and <em>fix</em> conflicts more
+conveniently.

src/main/java/cc/duduhuo/git/conflict/setting/ColorSettingsPanel.java

@@ -1,5 +1,7 @@
 package cc.duduhuo.git.conflict.setting;
 
+import com.intellij.openapi.options.SearchableConfigurable;
+
 import javax.swing.*;
 
 /**
@@ -10,7 +12,7 @@
  * Remarks:
  * =======================================================
  */
-public abstract class ColorSettingsPanel {
+public abstract class ColorSettingsPanel implements SearchableConfigurable {
     protected JRadioButton radioDefault;
     protected JRadioButton radioDarcula;
     protected JPanel mainPanel;

src/main/java/cc/duduhuo/git/conflict/setting/ColorSettingsPanelImpl.java

@@ -17,21 +17,20 @@
  * Remarks:
  * =======================================================
  */
-public class ColorSettingsPanelImpl extends ColorSettingsPanel implements SearchableConfigurable {
+public class ColorSettingsPanelImpl extends ColorSettingsPanel {
     public ColorSettingsPanelImpl() {
-        super();
         initUI();
     }
 
     private void initUI() {
-        this.radioDefault.setSelected(false);
-        this.radioDarcula.setSelected(false);
+        radioDefault.setSelected(false);
+        radioDarcula.setSelected(false);
         if (GlobalSettings.getMarkColor().equals(SettingsService.ColorSettings.DEFAULT)) {
             System.out.println("default==");
-            this.radioDefault.setSelected(true);
+            radioDefault.setSelected(true);
         } else if (GlobalSettings.getMarkColor().equals(SettingsService.ColorSettings.DARCULA)) {
             System.out.println("darcula==");
-            this.radioDarcula.setSelected(true);
+            radioDarcula.setSelected(true);
         }
     }
 
@@ -50,14 +49,14 @@ public String getDisplayName() {
     @Nullable
     @Override
     public JComponent createComponent() {
-        return this.mainPanel;
+        return mainPanel;
     }
 
     @Override
     public boolean isModified() {
-        if (this.radioDefault.isSelected()) {
+        if (radioDefault.isSelected()) {
             return !GlobalSettings.getMarkColor().equals(SettingsService.ColorSettings.DEFAULT);
-        } else if (this.radioDarcula.isSelected()) {
+        } else if (radioDarcula.isSelected()) {
             return !GlobalSettings.getMarkColor().equals(SettingsService.ColorSettings.DARCULA);
         }
         return false;
@@ -72,14 +71,17 @@ public void reset() {
 
     @Override
     public void apply() {
+        boolean isModified = isModified();
         if (radioDefault.isSelected()) {
             GlobalSettings.getMarkColor().setMarkColor(SettingsService.ColorSettings.DEFAULT);
             Global.sCurrentColor = SettingsService.ColorSettings.DEFAULT;
         } else if (radioDarcula.isSelected()) {
             GlobalSettings.getMarkColor().setMarkColor(SettingsService.ColorSettings.DARCULA);
             Global.sCurrentColor = SettingsService.ColorSettings.DARCULA;
         }
-        TextAttr.loadTextAttr();
-        HighlightConflictAction.refreshHighlight();
+        if (isModified) {
+            TextAttr.loadTextAttr();
+            HighlightConflictAction.refreshHighlight();
+        }
     }
 }

src/main/resources/META-INF/plugin.xml

@@ -4,9 +4,6 @@
     <vendor email="[email protected]" url="https://github.com/liying2008/git-conflict">liying</vendor>
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
     <idea-version since-build="162"/>
-    <description><![CDATA[
-    Highlight <span style="font-weight:bold;"><em>git conflict</em></span> content and <em>fix</em> conflicts more conveniently.
-    ]]></description>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
          on how to target different products -->