release v1.0.0

liying2008 · Apr 29, 2018 · 3e23893 · 3e23893
1 parent cac857d
commit 3e23893
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@
 
 ![fix-git-conflict](example/fix-git-conflict.gif)
 
-**设置面板：** 通过 `Settings -> Tools -> Git Conflict` 进入设置面板，可以根据 IDE 的颜色方案选择冲突高亮的颜色方案：
+**设置面板：** 通过 `Settings -> Tools -> Git Conflict` 进入设置面板，选择自己喜欢的颜色方案：
 
 ![settings-panel](example/settings-panel.png)
 

diff --git a/example/settings-panel.png b/example/settings-panel.png
diff --git a/src/main/java/cc/duduhuo/git/conflict/GlobalSettings.java b/src/main/java/cc/duduhuo/git/conflict/GlobalSettings.java
@@ -12,7 +12,7 @@
  * Remarks:
  * =======================================================
  */
-public class GlobalSettings {
+public final class GlobalSettings {
     public static PersistentState getPersistentState() {
         return ServiceManager.getService(SettingsService.class).state;
     }

diff --git a/src/main/java/cc/duduhuo/git/conflict/setting/ColorSettingsPanelImpl.java b/src/main/java/cc/duduhuo/git/conflict/setting/ColorSettingsPanelImpl.java
@@ -21,7 +21,7 @@
  * =======================================================
  * Author: liying - liruoer2008@yeah.net
  * Datetime: 2018/4/22 16:50
- * Description:
+ * Description: Settings panel's implementation
  * Remarks:
  * =======================================================
  */

diff --git a/src/main/java/cc/duduhuo/git/conflict/setting/SettingsService.java b/src/main/java/cc/duduhuo/git/conflict/setting/SettingsService.java
@@ -6,7 +6,7 @@
  * =======================================================
  * Author: liying - liruoer2008@yeah.net
  * Datetime: 2018/4/22 17:47
- * Description:
+ * Description: Settings service interface
  * Remarks:
  * =======================================================
  */

diff --git a/src/main/java/cc/duduhuo/git/conflict/setting/SettingsServiceImpl.java b/src/main/java/cc/duduhuo/git/conflict/setting/SettingsServiceImpl.java
@@ -12,7 +12,7 @@
  * =======================================================
  * Author: liying - liruoer2008@yeah.net
  * Datetime: 2018/4/22 18:12
- * Description:
+ * Description: Settings service implementation
  * Remarks:
  * =======================================================
  */