diff --git a/README.md b/README.md index 8f94391..00bb415 100644 --- 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 index 5b66c32..b1ea012 100644 Binary files a/example/settings-panel.png and b/example/settings-panel.png differ diff --git a/src/main/java/cc/duduhuo/git/conflict/GlobalSettings.java b/src/main/java/cc/duduhuo/git/conflict/GlobalSettings.java index 32fff56..7488837 100644 --- 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 index bb31b7a..7b37509 100644 --- 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 index e0acc1f..292dcc6 100644 --- 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 index f0ca4e7..058860e 100644 --- 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: * ======================================================= */