From 3e23893ee1f703202534d50fff1920ba37916603 Mon Sep 17 00:00:00 2001 From: liying2008 Date: Sun, 29 Apr 2018 15:47:10 +0800 Subject: [PATCH] release v1.0.0 --- README.md | 2 +- example/settings-panel.png | Bin 16159 -> 18776 bytes .../duduhuo/git/conflict/GlobalSettings.java | 2 +- .../setting/ColorSettingsPanelImpl.java | 2 +- .../git/conflict/setting/SettingsService.java | 2 +- .../conflict/setting/SettingsServiceImpl.java | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) 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 5b66c32fbf06606aecf0f2ae5482d8de080d2291..b1ea012284446215e2338a7256a2aa069a80417a 100644 GIT binary patch literal 18776 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 b_PQX44sCH#+d3Y26zIxDy$gj}HrW3Gs=wNF literal 16159 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�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 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: * ======================================================= */