Rename setting repositories and refactor

3 files changed, 12 insertions, 13 deletions

diff --git a/src/background/usecases/CommandUseCase.ts b/src/background/usecases/CommandUseCase.ts
index fcb898d..20ded7e 100644
--- a/src/background/usecases/CommandUseCase.ts
+++ b/src/background/usecases/CommandUseCase.ts
@@ -5,7 +5,7 @@ import * as urls from '../../shared/urls';
 import TabPresenter from '../presenters/TabPresenter';
 import WindowPresenter from '../presenters/WindowPresenter';
 import HelpPresenter from '../presenters/HelpPresenter';
-import SettingRepository from '../repositories/SettingRepository';
+import CachedSettingRepository from '../repositories/CachedSettingRepository';
 import BookmarkRepository from '../repositories/BookmarkRepository';
 import ConsoleClient from '../infrastructures/ConsoleClient';
 import ContentMessageClient from '../infrastructures/ContentMessageClient';
@@ -17,7 +17,7 @@ export default class CommandIndicator {
     private tabPresenter: TabPresenter,
     private windowPresenter: WindowPresenter,
     private helpPresenter: HelpPresenter,
-    private settingRepository: SettingRepository,
+    private settingRepository: CachedSettingRepository,
     private bookmarkRepository: BookmarkRepository,
     private consoleClient: ConsoleClient,
     private contentMessageClient: ContentMessageClient,
diff --git a/src/background/usecases/CompletionsUseCase.ts b/src/background/usecases/CompletionsUseCase.ts
index 779c61d..72ba929 100644
--- a/src/background/usecases/CompletionsUseCase.ts
+++ b/src/background/usecases/CompletionsUseCase.ts
@@ -3,7 +3,7 @@ import CompletionGroup from '../domains/CompletionGroup';
 import CommandDocs from '../domains/CommandDocs';
 import CompletionsRepository from '../repositories/CompletionsRepository';
 import * as filters from './filters';
-import SettingRepository from '../repositories/SettingRepository';
+import CachedSettingRepository from '../repositories/CachedSettingRepository';
 import TabPresenter from '../presenters/TabPresenter';
 import Properties from '../../shared/settings/Properties';
 
@@ -17,7 +17,7 @@ export default class CompletionsUseCase {
   constructor(
     private tabPresenter: TabPresenter,
     private completionsRepository: CompletionsRepository,
-    private settingRepository: SettingRepository,
+    private settingRepository: CachedSettingRepository,
   ) {
   }
 
diff --git a/src/background/usecases/SettingUseCase.ts b/src/background/usecases/SettingUseCase.ts
index d78d440..bd61157 100644
--- a/src/background/usecases/SettingUseCase.ts
+++ b/src/background/usecases/SettingUseCase.ts
@@ -1,7 +1,6 @@
 import { injectable } from 'tsyringe';
-import PersistentSettingRepository
-  from '../repositories/PersistentSettingRepository';
-import SettingRepository from '../repositories/SettingRepository';
+import LocalSettingRepository from '../repositories/LocalSettingRepository';
+import CachedSettingRepository from '../repositories/CachedSettingRepository';
 import { DefaultSettingData } from '../../shared/SettingData';
 import Settings from '../../shared/settings/Settings';
 import NotifyPresenter from '../presenters/NotifyPresenter';
@@ -10,20 +9,20 @@ import NotifyPresenter from '../presenters/NotifyPresenter';
 export default class SettingUseCase {
 
   constructor(
-    private persistentSettingRepository: PersistentSettingRepository,
-    private settingRepository: SettingRepository,
+    private localSettingRepository: LocalSettingRepository,
+    private cachedSettingRepository: CachedSettingRepository,
     private notifyPresenter: NotifyPresenter,
   ) {
   }
 
-  get(): Promise<Settings> {
-    return this.settingRepository.get();
+  getCached(): Promise<Settings> {
+    return this.cachedSettingRepository.get();
   }
 
   async reload(): Promise<Settings> {
     let data;
     try {
-      data = await this.persistentSettingRepository.load();
+      data = await this.localSettingRepository.load();
     } catch (e) {
       this.showUnableToLoad(e);
     }
@@ -38,7 +37,7 @@ export default class SettingUseCase {
       this.showUnableToLoad(e);
       value = DefaultSettingData.toSettings();
     }
-    this.settingRepository.update(value!!);
+    this.cachedSettingRepository.update(value!!);
     return value;
   }