Remove instance logic for BinaryStorage and JsonStorage, part 2

1. part of #389
2. file rename
3. fixup

Plugins/Wox.Plugin.CMD/CMDHistory.cs

@@ -1,7 +1,4 @@
 using System.Collections.Generic;
-using System.ComponentModel;
-using Newtonsoft.Json;
-using Wox.Infrastructure.Storage;
 
 namespace Wox.Plugin.CMD
 {

Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj

@@ -59,10 +59,10 @@
       <Link>Properties\SolutionAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="CMD.cs" />
+    <Compile Include="CMDHistory.cs" />
     <Compile Include="CMDSetting.xaml.cs">
       <DependentUpon>CMDSetting.xaml</DependentUpon>
     </Compile>
-    <Compile Include="CMDStorage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj

@@ -62,7 +62,7 @@
     <Compile Include="Everything\Exceptions\RegisterClassExException.cs" />
     <Compile Include="Everything\ResultType.cs" />
     <Compile Include="Everything\SearchResult.cs" />
-    <Compile Include="ContextMenuStorage.cs" />
+    <Compile Include="Settings.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

Plugins/Wox.Plugin.Folder/Settings.cs

@@ -8,6 +8,5 @@ namespace Wox.Plugin.Folder
     {
         [JsonProperty]
         public List<FolderLink> FolderLinks { get; set; }
-
     }
 }

Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj

@@ -59,7 +59,7 @@
     <Compile Include="FolderPluginSettings.xaml.cs">
       <DependentUpon>FolderPluginSettings.xaml</DependentUpon>
     </Compile>
-    <Compile Include="FolderStorage.cs" />
+    <Compile Include="Settings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj

@@ -59,7 +59,7 @@
     <Compile Include="FileChangeWatcher.cs" />
     <Compile Include="IProgramSource.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="ProgramCacheStorage.cs" />
+    <Compile Include="ProgramIndexCache.cs" />
     <Compile Include="Programs.cs" />
     <Compile Include="ProgramSetting.xaml.cs">
       <DependentUpon>ProgramSetting.xaml</DependentUpon>
@@ -69,7 +69,7 @@
     <Compile Include="ProgramSources\CommonStartMenuProgramSource.cs" />
     <Compile Include="ProgramSources\FileSystemProgramSource.cs" />
     <Compile Include="ProgramSources\UserStartMenuProgramSource.cs" />
-    <Compile Include="ProgramStorage.cs" />
+    <Compile Include="Settings.cs" />
     <Compile Include="ProgramSuffixes.xaml.cs">
       <DependentUpon>ProgramSuffixes.xaml</DependentUpon>
     </Compile>

Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj

@@ -67,7 +67,7 @@
     <Compile Include="WebSearchSetting.xaml.cs">
       <DependentUpon>WebSearchSetting.xaml</DependentUpon>
     </Compile>
-    <Compile Include="WebSearchStorage.cs" />
+    <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Images\google.png">

Wox.Core/Wox.Core.csproj

@@ -84,9 +84,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resource\FontHelper.cs" />
     <Compile Include="Resource\Theme.cs" />
-    <Compile Include="UserSettings\CustomizedPluginConfig.cs" />
+    <Compile Include="UserSettings\PluginConfig.cs" />
     <Compile Include="UserSettings\PluginHotkey.cs" />
-    <Compile Include="UserSettings\UserSettingStorage.cs" />
+    <Compile Include="UserSettings\Settings.cs" />
     <Compile Include="Updater\SemanticVersion.cs" />
   </ItemGroup>
   <ItemGroup>

Wox.Infrastructure/Wox.Infrastructure.csproj

@@ -67,12 +67,10 @@
     <Compile Include="WoxDirectroy.cs" />
     <Compile Include="Stopwatch.cs" />
     <Compile Include="Storage\BinaryStorage.cs" />
-    <Compile Include="Storage\IStorage.cs" />
     <Compile Include="Storage\JsonStorage.cs" />
     <Compile Include="StringMatcher.cs" />
     <Compile Include="Unidecoder.Characters.cs" />
     <Compile Include="Http\HttpRequest.cs" />
-    <Compile Include="Storage\BaseStorage.cs" />
     <Compile Include="FuzzyMatcher.cs" />
     <Compile Include="Hotkey\GlobalHotkey.cs" />
     <Compile Include="Hotkey\HotkeyModel.cs" />

Wox/Wox.csproj

@@ -131,9 +131,9 @@
     <Compile Include="ResultListBox.xaml.cs">
       <DependentUpon>ResultListBox.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Storage\QueryHistoryStorage.cs" />
-    <Compile Include="Storage\TopMostRecordStorage.cs" />
-    <Compile Include="Storage\UserSelectedRecordStorage.cs" />
+    <Compile Include="Storage\QueryHistory.cs" />
+    <Compile Include="Storage\TopMostRecord.cs" />
+    <Compile Include="Storage\UserSelectedRecord.cs" />
     <Compile Include="ViewModel\BaseViewModel.cs" />
     <Compile Include="ViewModel\MainViewModel.cs" />
     <Compile Include="ViewModel\ResultViewModel.cs" />