Model、View、Net、Utilの名前空間にクラスを分類する

diff --git a/KancolleSniffer.Test/Ascii85Test.cs b/KancolleSniffer.Test/Ascii85Test.cs
index 399d328..62aeec7 100644 (file)
--- a/KancolleSniffer.Test/Ascii85Test.cs
+++ b/KancolleSniffer.Test/Ascii85Test.cs
@@ -14,6 +14,7 @@
 \r
 using System.Collections.Generic;\r
 using ExpressionToCodeLib;\r
+using KancolleSniffer.Util;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
 \r
 namespace KancolleSniffer.Test\r

diff --git a/KancolleSniffer.Test/BattleLogProcessorTest.cs b/KancolleSniffer.Test/BattleLogProcessorTest.cs
index 912b346..0cc6718 100644 (file)
--- a/KancolleSniffer.Test/BattleLogProcessorTest.cs
+++ b/KancolleSniffer.Test/BattleLogProcessorTest.cs
@@ -1,5 +1,6 @@
 using System.Linq;\r
 using ExpressionToCodeLib;\r
+using KancolleSniffer.Net;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
 \r
 namespace KancolleSniffer.Test\r

diff --git a/KancolleSniffer.Test/BattleTest.cs b/KancolleSniffer.Test/BattleTest.cs
index de430fa..e558b34 100644 (file)
--- a/KancolleSniffer.Test/BattleTest.cs
+++ b/KancolleSniffer.Test/BattleTest.cs
@@ -14,6 +14,8 @@
 \r
 using System;\r
 using ExpressionToCodeLib;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Util;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
 \r
 namespace KancolleSniffer.Test\r

diff --git a/KancolleSniffer.Test/JsonTest.cs b/KancolleSniffer.Test/JsonTest.cs
index 58f6a4d..e4bfa7c 100644 (file)
--- a/KancolleSniffer.Test/JsonTest.cs
+++ b/KancolleSniffer.Test/JsonTest.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;\r
 using System.Linq;\r
+using KancolleSniffer.Util;\r
 using Microsoft.CSharp.RuntimeBinder;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
 \r

diff --git a/KancolleSniffer.Test/LoggerTest.cs b/KancolleSniffer.Test/LoggerTest.cs
index 6f3c292..822f2ee 100644 (file)
--- a/KancolleSniffer.Test/LoggerTest.cs
+++ b/KancolleSniffer.Test/LoggerTest.cs
@@ -16,6 +16,7 @@ using System;
 using System.Collections.Generic;\r
 using System.IO;\r
 using ExpressionToCodeLib;\r
+using KancolleSniffer.Util;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
 using Moq;\r
 \r

diff --git a/KancolleSniffer.Test/QuestInfoTest.cs b/KancolleSniffer.Test/QuestInfoTest.cs
index b98bd25..03f9843 100644 (file)
--- a/KancolleSniffer.Test/QuestInfoTest.cs
+++ b/KancolleSniffer.Test/QuestInfoTest.cs
@@ -16,6 +16,8 @@ using System;
 using System.Collections.Generic;\r
 using System.Linq;\r
 using ExpressionToCodeLib;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Util;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
 \r
 namespace KancolleSniffer.Test\r

diff --git a/KancolleSniffer.Test/ShipLabelTest.cs b/KancolleSniffer.Test/ShipLabelTest.cs
index 0486ad5..bfdcdfb 100644 (file)
--- a/KancolleSniffer.Test/ShipLabelTest.cs
+++ b/KancolleSniffer.Test/ShipLabelTest.cs
@@ -16,6 +16,8 @@ using System.Collections.Generic;
 using System.Drawing;\r
 using System.Windows.Forms;\r
 using ExpressionToCodeLib;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.View;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
 \r
 namespace KancolleSniffer.Test\r

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 76d8010..babbb21 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -18,6 +18,8 @@ using System.IO;
 using System.IO.Compression;\r
 using System.Linq;\r
 using ExpressionToCodeLib;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Util;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
 \r
 namespace KancolleSniffer.Test\r

diff --git a/KancolleSniffer/ConfigDialog.cs b/KancolleSniffer/ConfigDialog.cs
index 2debe75..83efdf7 100644 (file)
--- a/KancolleSniffer/ConfigDialog.cs
+++ b/KancolleSniffer/ConfigDialog.cs
@@ -18,6 +18,8 @@ using System.Diagnostics;
 using System.Drawing;\r
 using System.IO;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Net;\r
+using KancolleSniffer.View;\r
 \r
 namespace KancolleSniffer\r
 {\r

diff --git a/KancolleSniffer/ErrorLog.cs b/KancolleSniffer/ErrorLog.cs
index 135ca6b..310c78c 100644 (file)
--- a/KancolleSniffer/ErrorLog.cs
+++ b/KancolleSniffer/ErrorLog.cs
@@ -20,6 +20,8 @@ using System.Linq;
 using System.Text;\r
 using System.Text.RegularExpressions;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Util;\r
 \r
 namespace KancolleSniffer\r
 {\r

diff --git a/KancolleSniffer/KancolleSniffer.csproj b/KancolleSniffer/KancolleSniffer.csproj
index 88687be..1c8a6e9 100644 (file)
--- a/KancolleSniffer/KancolleSniffer.csproj
+++ b/KancolleSniffer/KancolleSniffer.csproj
@@ -54,20 +54,20 @@
     <Reference Include="System.Xml" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <Compile Include="Achievement.cs" />\r
-    <Compile Include="AkashiTimer.cs" />\r
-    <Compile Include="AlarmTimer.cs" />\r
-    <Compile Include="AntiAirPanel.cs">\r
+    <Compile Include="Model\Achievement.cs" />\r
+    <Compile Include="Model\AkashiTimer.cs" />\r
+    <Compile Include="Model\AlarmTimer.cs" />\r
+    <Compile Include="View\AntiAirPanel.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
-    <Compile Include="AirBattleResultPanel.cs" />\r
-    <Compile Include="Ascii85.cs" />\r
-    <Compile Include="BaseAirCoprs.cs" />\r
-    <Compile Include="BattleInfo.cs" />\r
-    <Compile Include="BattleResultPanel.cs">\r
+    <Compile Include="View\AirBattleResultPanel.cs" />\r
+    <Compile Include="Util\Ascii85.cs" />\r
+    <Compile Include="Model\BaseAirCoprs.cs" />\r
+    <Compile Include="Model\BattleInfo.cs" />\r
+    <Compile Include="View\BattleResultPanel.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
-    <Compile Include="CellInfo.cs" />\r
+    <Compile Include="Model\CellInfo.cs" />\r
     <Compile Include="ErrorLog.cs" />\r
     <Compile Include="Config.cs" />\r
     <Compile Include="ConfigDialog.cs">\r
@@ -82,30 +82,30 @@
     <Compile Include="ConfirmDialog.Designer.cs">\r
       <DependentUpon>ConfirmDialog.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="CUDColor.cs" />\r
-    <Compile Include="DockInfo.cs" />\r
-    <Compile Include="Fleet.cs" />\r
-    <Compile Include="FleetPanel.cs">\r
+    <Compile Include="Util\CUDColor.cs" />\r
+    <Compile Include="Model\DockInfo.cs" />\r
+    <Compile Include="Model\Fleet.cs" />\r
+    <Compile Include="View\FleetPanel.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
-    <Compile Include="ExMapInfo.cs" />\r
+    <Compile Include="Model\ExMapInfo.cs" />\r
     <Compile Include="ErrorDialog.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
     <Compile Include="ErrorDialog.Designer.cs">\r
       <DependentUpon>ErrorDialog.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="HttpProxy.cs" />\r
-    <Compile Include="HttpUtility.cs" />\r
-    <Compile Include="ItemTreeView.cs">\r
+    <Compile Include="Net\HttpProxy.cs" />\r
+    <Compile Include="Util\HttpUtility.cs" />\r
+    <Compile Include="View\ItemTreeView.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
-    <Compile Include="JsonParser.cs" />\r
+    <Compile Include="Util\JsonParser.cs" />\r
     <Compile Include="Logger.cs" />\r
-    <Compile Include="LogServer.cs" />\r
-    <Compile Include="MaterialInfo.cs" />\r
-    <Compile Include="MiscTextInfo.cs" />\r
-    <Compile Include="AdditionalData.cs" />\r
+    <Compile Include="Net\LogServer.cs" />\r
+    <Compile Include="Model\MaterialInfo.cs" />\r
+    <Compile Include="View\MiscTextInfo.cs" />\r
+    <Compile Include="Model\AdditionalData.cs" />\r
     <Compile Include="NotificationConfigDialog.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
@@ -113,13 +113,13 @@
       <DependentUpon>NotificationConfigDialog.cs</DependentUpon>\r
     </Compile>\r
     <Compile Include="NotificationManager.cs" />\r
-    <Compile Include="PresetDeck.cs" />\r
-    <Compile Include="ProxyManager.cs" />\r
-    <Compile Include="PushNotification.cs" />\r
-    <Compile Include="RepairListForMain.cs">\r
+    <Compile Include="Model\PresetDeck.cs" />\r
+    <Compile Include="Net\ProxyManager.cs" />\r
+    <Compile Include="Net\PushNotification.cs" />\r
+    <Compile Include="View\RepairListForMain.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
-    <Compile Include="MainFormLabels.cs" />\r
+    <Compile Include="View\MainFormLabels.cs" />\r
     <Compile Include="ListForm.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
@@ -132,28 +132,28 @@
     <Compile Include="MainForm.Designer.cs">\r
       <DependentUpon>MainForm.cs</DependentUpon>\r
     </Compile>\r
-    <Compile Include="MissionInfo.cs" />\r
+    <Compile Include="Model\MissionInfo.cs" />\r
     <Compile Include="Program.cs" />\r
     <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="QuestInfo.cs" />\r
-    <Compile Include="ConditionTimer.cs" />\r
-    <Compile Include="ResizableToolTip.cs">\r
+    <Compile Include="Model\QuestInfo.cs" />\r
+    <Compile Include="Model\ConditionTimer.cs" />\r
+    <Compile Include="View\ResizableToolTip.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
-    <Compile Include="ShipInfo.cs" />\r
-    <Compile Include="ShipLabel.cs" />\r
-    <Compile Include="ShipListPanel.cs">\r
+    <Compile Include="Model\ShipInfo.cs" />\r
+    <Compile Include="View\ShipLabel.cs" />\r
+    <Compile Include="View\ShipListPanel.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r
-    <Compile Include="ShipMaster.cs" />\r
-    <Compile Include="ShipStatus.cs" />\r
+    <Compile Include="Model\ShipMaster.cs" />\r
+    <Compile Include="Model\ShipStatus.cs" />\r
     <Compile Include="Sniffer.cs" />\r
-    <Compile Include="ItemInfo.cs" />\r
-    <Compile Include="Status.cs" />\r
-    <Compile Include="SwipeScrollify.cs" />\r
-    <Compile Include="SystemProxy.cs" />\r
+    <Compile Include="Model\ItemInfo.cs" />\r
+    <Compile Include="Model\Status.cs" />\r
+    <Compile Include="View\SwipeScrollify.cs" />\r
+    <Compile Include="Net\SystemProxy.cs" />\r
     <Compile Include="TextGenerator.cs" />\r
-    <Compile Include="Win32API.cs" />\r
+    <Compile Include="Util\Win32API.cs" />\r
     <EmbeddedResource Include="ConfigDialog.resx">\r
       <DependentUpon>ConfigDialog.cs</DependentUpon>\r
     </EmbeddedResource>\r
@@ -199,6 +199,7 @@
   <ItemGroup>\r
     <Content Include="app.ico" />\r
   </ItemGroup>\r
+  <ItemGroup />\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <PropertyGroup>\r
     <PostBuildEvent>COPY $(SolutionDir)\Data\*.* $(TargetDir)</PostBuildEvent>\r

diff --git a/KancolleSniffer/ListForm.Designer.cs b/KancolleSniffer/ListForm.Designer.cs
index 0e12e68..f60b875 100644 (file)
--- a/KancolleSniffer/ListForm.Designer.cs
+++ b/KancolleSniffer/ListForm.Designer.cs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
 \r
+using KancolleSniffer.View;\r
+\r
 namespace KancolleSniffer\r
 {\r
     partial class ListForm\r
@@ -76,12 +78,12 @@ namespace KancolleSniffer
             this.label1Fleet3 = new System.Windows.Forms.Label();\r
             this.labelFleet2 = new System.Windows.Forms.Label();\r
             this.labelFleet1 = new System.Windows.Forms.Label();\r
-            this.airBattleResultPanel = new KancolleSniffer.AirBattleResultPanel();\r
-            this.battleResultPanel = new KancolleSniffer.BattleResultPanel();\r
-            this.antiAirPanel = new KancolleSniffer.AntiAirPanel();\r
-            this.fleetPanel = new KancolleSniffer.FleetPanel();\r
-            this.itemTreeView = new KancolleSniffer.ItemTreeView();\r
-            this.shipListPanel = new KancolleSniffer.ShipListPanel();\r
+            this.airBattleResultPanel = new AirBattleResultPanel();\r
+            this.battleResultPanel = new BattleResultPanel();\r
+            this.antiAirPanel = new AntiAirPanel();\r
+            this.fleetPanel = new FleetPanel();\r
+            this.itemTreeView = new ItemTreeView();\r
+            this.shipListPanel = new ShipListPanel();\r
             this.contextMenuStripShipList.SuspendLayout();\r
             this.contextMenuStrip.SuspendLayout();\r
             this.panelGroupHeader.SuspendLayout();\r

diff --git a/KancolleSniffer/ListForm.cs b/KancolleSniffer/ListForm.cs
index 7b2de2a..8938b7c 100644 (file)
--- a/KancolleSniffer/ListForm.cs
+++ b/KancolleSniffer/ListForm.cs
@@ -17,6 +17,8 @@ using System.Collections.Generic;
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Util;\r
+using KancolleSniffer.View;\r
 using static System.Math;\r
 \r
 namespace KancolleSniffer\r

diff --git a/KancolleSniffer/Logger.cs b/KancolleSniffer/Logger.cs
index 5b39fe0..c50bba9 100644 (file)
--- a/KancolleSniffer/Logger.cs
+++ b/KancolleSniffer/Logger.cs
@@ -18,6 +18,8 @@ using System.Globalization;
 using System.IO;\r
 using System.Linq;\r
 using System.Text;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Util;\r
 \r
 namespace KancolleSniffer\r
 {\r

diff --git a/KancolleSniffer/MainForm.Designer.cs b/KancolleSniffer/MainForm.Designer.cs
index cea95d1..5b42277 100644 (file)
--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/MainForm.Designer.cs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
 \r
+using KancolleSniffer.View;\r
+\r
 namespace KancolleSniffer\r
 {\r
     partial class MainForm\r
@@ -163,13 +165,13 @@ namespace KancolleSniffer
             this.labelFuelSq4 = new System.Windows.Forms.Label();\r
             this.labelAkashiRepair = new System.Windows.Forms.Label();\r
             this.labelClearQuest = new System.Windows.Forms.Label();\r
-            this.panelRepairList = new KancolleSniffer.RepairListForMain();\r
-            this.labelQuestCount1 = new KancolleSniffer.ShipLabel();\r
-            this.labelQuestCount2 = new KancolleSniffer.ShipLabel();\r
-            this.labelQuestCount3 = new KancolleSniffer.ShipLabel();\r
-            this.labelQuestCount4 = new KancolleSniffer.ShipLabel();\r
-            this.labelQuestCount5 = new KancolleSniffer.ShipLabel();\r
-            this.labelQuestCount6 = new KancolleSniffer.ShipLabel();\r
+            this.panelRepairList = new RepairListForMain();\r
+            this.labelQuestCount1 = new ShipLabel();\r
+            this.labelQuestCount2 = new ShipLabel();\r
+            this.labelQuestCount3 = new ShipLabel();\r
+            this.labelQuestCount4 = new ShipLabel();\r
+            this.labelQuestCount5 = new ShipLabel();\r
+            this.labelQuestCount6 = new ShipLabel();\r
             this.panelHeadquarters.SuspendLayout();\r
             this.panelShipInfo.SuspendLayout();\r
             this.panelBattleInfo.SuspendLayout();\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index ae092d9..d2063fb 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -26,6 +26,10 @@ using System.Text;
 using System.Text.RegularExpressions;\r
 using System.Threading.Tasks;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Net;\r
+using KancolleSniffer.Util;\r
+using KancolleSniffer.View;\r
 using Microsoft.CSharp.RuntimeBinder;\r
 using static System.Math;\r
 \r

diff --git a/KancolleSniffer/Achievement.cs b/KancolleSniffer/Model/Achievement.cs
similarity index 95%
rename from KancolleSniffer/Achievement.cs
rename to KancolleSniffer/Model/Achievement.cs
index 62aa2cf..7d4e345 100644 (file)
--- a/KancolleSniffer/Achievement.cs
+++ b/KancolleSniffer/Model/Achievement.cs
@@ -16,7 +16,7 @@ using System;
 using System.Collections.Generic;\r
 using System.Xml.Serialization;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class Achievement : IHaveState\r
     {\r

diff --git a/KancolleSniffer/AdditionalData.cs b/KancolleSniffer/Model/AdditionalData.cs
similarity index 96%
rename from KancolleSniffer/AdditionalData.cs
rename to KancolleSniffer/Model/AdditionalData.cs
index 39ca448..52642f6 100644 (file)
--- a/KancolleSniffer/AdditionalData.cs
+++ b/KancolleSniffer/Model/AdditionalData.cs
@@ -17,7 +17,7 @@ using System.Collections.Generic;
 using System.IO;\r
 using System.Linq;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class AdditionalData\r
     {\r

diff --git a/KancolleSniffer/AkashiTimer.cs b/KancolleSniffer/Model/AkashiTimer.cs
similarity index 96%
rename from KancolleSniffer/AkashiTimer.cs
rename to KancolleSniffer/Model/AkashiTimer.cs
index b262c24..0490206 100644 (file)
--- a/KancolleSniffer/AkashiTimer.cs
+++ b/KancolleSniffer/Model/AkashiTimer.cs
@@ -15,8 +15,9 @@
 using System;\r
 using System.Collections.Generic;\r
 using System.Linq;\r
+using KancolleSniffer.Util;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class AkashiTimer\r
     {\r

diff --git a/KancolleSniffer/AlarmTimer.cs b/KancolleSniffer/Model/AlarmTimer.cs
similarity index 95%
rename from KancolleSniffer/AlarmTimer.cs
rename to KancolleSniffer/Model/AlarmTimer.cs
index ef5a707..7390f05 100644 (file)
--- a/KancolleSniffer/AlarmTimer.cs
+++ b/KancolleSniffer/Model/AlarmTimer.cs
@@ -15,7 +15,7 @@
 using System;\r
 using System.Globalization;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class NameAndTimer\r
     {\r

diff --git a/KancolleSniffer/BaseAirCoprs.cs b/KancolleSniffer/Model/BaseAirCoprs.cs
similarity index 96%
rename from KancolleSniffer/BaseAirCoprs.cs
rename to KancolleSniffer/Model/BaseAirCoprs.cs
index 253248f..a5b2976 100644 (file)
--- a/KancolleSniffer/BaseAirCoprs.cs
+++ b/KancolleSniffer/Model/BaseAirCoprs.cs
@@ -16,8 +16,9 @@ using System;
 using System.Collections.Generic;\r
 using System.Collections.Specialized;\r
 using System.Linq;\r
+using KancolleSniffer.Util;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class BaseAirCoprs\r
     {\r

diff --git a/KancolleSniffer/BattleInfo.cs b/KancolleSniffer/Model/BattleInfo.cs
similarity index 97%
rename from KancolleSniffer/BattleInfo.cs
rename to KancolleSniffer/Model/BattleInfo.cs
index 3b2e767..ff93b29 100644 (file)
--- a/KancolleSniffer/BattleInfo.cs
+++ b/KancolleSniffer/Model/BattleInfo.cs
@@ -15,9 +15,11 @@
 using System;\r
 using System.Collections.Generic;\r
 using System.Linq;\r
+using KancolleSniffer.Util;\r
+using KancolleSniffer.View;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public enum BattleResultRank\r
     {\r

diff --git a/KancolleSniffer/CellInfo.cs b/KancolleSniffer/Model/CellInfo.cs
similarity index 95%
rename from KancolleSniffer/CellInfo.cs
rename to KancolleSniffer/Model/CellInfo.cs
index 6322065..04155a3 100644 (file)
--- a/KancolleSniffer/CellInfo.cs
+++ b/KancolleSniffer/Model/CellInfo.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class CellInfo\r
     {\r

diff --git a/KancolleSniffer/ConditionTimer.cs b/KancolleSniffer/Model/ConditionTimer.cs
similarity index 96%
rename from KancolleSniffer/ConditionTimer.cs
rename to KancolleSniffer/Model/ConditionTimer.cs
index 965b7c1..10af79a 100644 (file)
--- a/KancolleSniffer/ConditionTimer.cs
+++ b/KancolleSniffer/Model/ConditionTimer.cs
@@ -15,7 +15,7 @@
 using System;\r
 using System.Linq;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class ConditionTimer : IHaveState\r
     {\r

diff --git a/KancolleSniffer/DockInfo.cs b/KancolleSniffer/Model/DockInfo.cs
similarity index 95%
rename from KancolleSniffer/DockInfo.cs
rename to KancolleSniffer/Model/DockInfo.cs
index 80b0493..1f5724a 100644 (file)
--- a/KancolleSniffer/DockInfo.cs
+++ b/KancolleSniffer/Model/DockInfo.cs
@@ -14,8 +14,9 @@
 \r
 using System;\r
 using System.Linq;\r
+using KancolleSniffer.Util;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class DockInfo\r
     {\r

diff --git a/KancolleSniffer/ExMapInfo.cs b/KancolleSniffer/Model/ExMapInfo.cs
similarity index 96%
rename from KancolleSniffer/ExMapInfo.cs
rename to KancolleSniffer/Model/ExMapInfo.cs
index cacfaa1..abaf95a 100644 (file)
--- a/KancolleSniffer/ExMapInfo.cs
+++ b/KancolleSniffer/Model/ExMapInfo.cs
@@ -16,7 +16,7 @@ using System;
 using System.Collections.Generic;\r
 using System.Linq;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class ExMapInfo : IHaveState\r
     {\r

diff --git a/KancolleSniffer/Fleet.cs b/KancolleSniffer/Model/Fleet.cs
similarity index 95%
rename from KancolleSniffer/Fleet.cs
rename to KancolleSniffer/Model/Fleet.cs
index e906237..c4237cf 100644 (file)
--- a/KancolleSniffer/Fleet.cs
+++ b/KancolleSniffer/Model/Fleet.cs
@@ -15,7 +15,7 @@
 using System.Linq;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public struct ChargeStatus\r
     {\r
@@ -87,7 +87,8 @@ namespace KancolleSniffer
                 var fs = new ChargeStatus(_shipInfo.GetStatus(Deck[0]));\r
                 var others = (from id in Deck.Skip(1) select new ChargeStatus(_shipInfo.GetStatus(id))).Aggregate(\r
                     (result, next) => new ChargeStatus(Max(result.Fuel, next.Fuel), Max(result.Bull, next.Bull)));\r
-                return new ChargeStatus(fs.Fuel != 0 ? fs.Fuel : others.Fuel + 5, fs.Bull != 0 ? fs.Bull : others.Bull + 5);\r
+                return new ChargeStatus(fs.Fuel != 0 ? fs.Fuel : others.Fuel + 5,\r
+                    fs.Bull != 0 ? fs.Bull : others.Bull + 5);\r
             }\r
         }\r
 \r

diff --git a/KancolleSniffer/ItemInfo.cs b/KancolleSniffer/Model/ItemInfo.cs
similarity index 96%
rename from KancolleSniffer/ItemInfo.cs
rename to KancolleSniffer/Model/ItemInfo.cs
index 01ccd4d..1d17b0d 100644 (file)
--- a/KancolleSniffer/ItemInfo.cs
+++ b/KancolleSniffer/Model/ItemInfo.cs
@@ -16,9 +16,10 @@ using System;
 using System.Collections.Generic;\r
 using System.Drawing;\r
 using System.Linq;\r
+using KancolleSniffer.Util;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class ItemSpec\r
     {\r

diff --git a/KancolleSniffer/MaterialInfo.cs b/KancolleSniffer/Model/MaterialInfo.cs
similarity index 96%
rename from KancolleSniffer/MaterialInfo.cs
rename to KancolleSniffer/Model/MaterialInfo.cs
index 266c42b..5205ff1 100644 (file)
--- a/KancolleSniffer/MaterialInfo.cs
+++ b/KancolleSniffer/Model/MaterialInfo.cs
@@ -16,7 +16,7 @@ using System;
 using System.Linq;\r
 using System.Xml.Serialization;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class MaterialInfo : IHaveState\r
     {\r

diff --git a/KancolleSniffer/MissionInfo.cs b/KancolleSniffer/Model/MissionInfo.cs
similarity index 95%
rename from KancolleSniffer/MissionInfo.cs
rename to KancolleSniffer/Model/MissionInfo.cs
index cdb9c54..4ec81bb 100644 (file)
--- a/KancolleSniffer/MissionInfo.cs
+++ b/KancolleSniffer/Model/MissionInfo.cs
@@ -14,7 +14,7 @@
 \r
 using System.Collections.Generic;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class MissionInfo\r
     {\r

diff --git a/KancolleSniffer/PresetDeck.cs b/KancolleSniffer/Model/PresetDeck.cs
similarity index 93%
rename from KancolleSniffer/PresetDeck.cs
rename to KancolleSniffer/Model/PresetDeck.cs
index 7d6f8a0..bd0a48a 100644 (file)
--- a/KancolleSniffer/PresetDeck.cs
+++ b/KancolleSniffer/Model/PresetDeck.cs
@@ -14,8 +14,9 @@
 \r
 using System.Collections.Generic;\r
 using System.Linq;\r
+using KancolleSniffer.Util;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class PresetDeck\r
     {\r

diff --git a/KancolleSniffer/QuestInfo.cs b/KancolleSniffer/Model/QuestInfo.cs
similarity index 96%
rename from KancolleSniffer/QuestInfo.cs
rename to KancolleSniffer/Model/QuestInfo.cs
index 48af995..72987d5 100644 (file)
--- a/KancolleSniffer/QuestInfo.cs
+++ b/KancolleSniffer/Model/QuestInfo.cs
@@ -18,9 +18,10 @@ using System.Drawing;
 using System.Linq;\r
 using System.Windows.Forms;\r
 using System.Xml.Serialization;\r
+using KancolleSniffer.Util;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class QuestStatus\r
     {\r
@@ -514,7 +515,8 @@ namespace KancolleSniffer
 \r
         private void RemoveQuest(QuestInterval interval)\r
         {\r
-            foreach (var id in (from kv in _quests where kv.Value.Count.Spec.Interval == interval select kv.Key).ToArray())\r
+            foreach (var id in\r
+                (from kv in _quests where kv.Value.Count.Spec.Interval == interval select kv.Key).ToArray())\r
                 _quests.Remove(id);\r
         }\r
 \r
@@ -626,7 +628,8 @@ namespace KancolleSniffer
                 {\r
                     var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec)\r
                         .ToArray();\r
-                    if (fleet.Count(spec => spec.ShipType == 2) >= 2 && fleet.Count(spec => spec.IsAircraftCarrier) >= 2)\r
+                    if (fleet.Count(spec => spec.ShipType == 2) >= 2 &&\r
+                        fleet.Count(spec => spec.IsAircraftCarrier) >= 2)\r
                         IncrementCount(q264.Count);\r
                 }\r
             }\r
@@ -667,7 +670,8 @@ namespace KancolleSniffer
             {\r
                 if (_map == 63 && _boss && QuestSortie.CompareRank(rank, "A") <= 0)\r
                 {\r
-                    var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec.ShipType).ToArray();\r
+                    var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec.ShipType)\r
+                        .ToArray();\r
                     if (fleet.Count(s => s == 3) >= 2 && fleet.Count(s => s == 16) >= 1)\r
                         IncrementCount(q862.Count);\r
                 }\r
@@ -700,13 +704,13 @@ namespace KancolleSniffer
                 if (_map == 54 && _boss && QuestSortie.CompareRank(rank, "S") == 0)\r
                 {\r
                     var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec.Id).ToArray();\r
-                    if (fleet.Contains(543) && fleet.Intersect(new []{344, 345, 359}).Any())\r
+                    if (fleet.Contains(543) && fleet.Intersect(new[] {344, 345, 359}).Any())\r
                         IncrementCount(q875.Count);\r
                 }\r
             }\r
         }\r
 \r
-        private int _questFleet = 0;\r
+        private int _questFleet;\r
 \r
         public void StartPractice(string request)\r
         {\r

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/Model/ShipInfo.cs
similarity index 96%
rename from KancolleSniffer/ShipInfo.cs
rename to KancolleSniffer/Model/ShipInfo.cs
index a5c87e4..141be45 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/Model/ShipInfo.cs
@@ -15,11 +15,11 @@
 using System;\r
 using System.Collections.Generic;\r
 using System.Linq;\r
+using KancolleSniffer.Util;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
-\r
     public class ShipInfo\r
     {\r
         public const int FleetCount = 4;\r
@@ -406,7 +406,8 @@ namespace KancolleSniffer
             var deck = (int)battle.api_deck_id - 1;\r
             InjectShips(deck, (int[])battle.api_f_nowhps, (int[])battle.api_f_maxhps, (int[][])item[0]);\r
             if (battle.api_f_nowhps_combined())\r
-                InjectShips(1, (int[])battle.api_f_nowhps_combined, (int[])battle.api_f_maxhps_combined, (int[][])item[1]);\r
+                InjectShips(1, (int[])battle.api_f_nowhps_combined, (int[])battle.api_f_maxhps_combined,\r
+                    (int[][])item[1]);\r
             foreach (var enemy in (int[])battle.api_ship_ke)\r
                 _shipMaster.InjectSpec(enemy);\r
             if (battle.api_ship_ke_combined())\r

diff --git a/KancolleSniffer/ShipMaster.cs b/KancolleSniffer/Model/ShipMaster.cs
similarity index 96%
rename from KancolleSniffer/ShipMaster.cs
rename to KancolleSniffer/Model/ShipMaster.cs
index c9a4d93..8cca998 100644 (file)
--- a/KancolleSniffer/ShipMaster.cs
+++ b/KancolleSniffer/Model/ShipMaster.cs
@@ -15,7 +15,7 @@
 using System;\r
 using System.Collections.Generic;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class ShipMaster\r
     {\r

diff --git a/KancolleSniffer/ShipStatus.cs b/KancolleSniffer/Model/ShipStatus.cs
similarity index 97%
rename from KancolleSniffer/ShipStatus.cs
rename to KancolleSniffer/Model/ShipStatus.cs
index c24b827..d3408f3 100644 (file)
--- a/KancolleSniffer/ShipStatus.cs
+++ b/KancolleSniffer/Model/ShipStatus.cs
@@ -17,7 +17,7 @@ using System.Collections.Generic;
 using System.Linq;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public class ShipStatus : ICloneable\r
     {\r

diff --git a/KancolleSniffer/Status.cs b/KancolleSniffer/Model/Status.cs
similarity index 96%
rename from KancolleSniffer/Status.cs
rename to KancolleSniffer/Model/Status.cs
index d76f28e..0c1dd9b 100644 (file)
--- a/KancolleSniffer/Status.cs
+++ b/KancolleSniffer/Model/Status.cs
@@ -17,7 +17,7 @@ using System.Collections.Generic;
 using System.IO;\r
 using System.Xml.Serialization;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Model\r
 {\r
     public interface IHaveState\r
     {\r

diff --git a/KancolleSniffer/HttpProxy.cs b/KancolleSniffer/Net/HttpProxy.cs
similarity index 97%
rename from KancolleSniffer/HttpProxy.cs
rename to KancolleSniffer/Net/HttpProxy.cs
index e738670..59e65f2 100644 (file)
--- a/KancolleSniffer/HttpProxy.cs
+++ b/KancolleSniffer/Net/HttpProxy.cs
@@ -22,7 +22,7 @@ using System.Text;
 using System.Text.RegularExpressions;\r
 using System.Threading.Tasks;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Net\r
 {\r
     public class HttpProxy\r
     {\r

diff --git a/KancolleSniffer/LogServer.cs b/KancolleSniffer/Net/LogServer.cs
similarity index 96%
rename from KancolleSniffer/LogServer.cs
rename to KancolleSniffer/Net/LogServer.cs
index 2c1103d..3212ebe 100644 (file)
--- a/KancolleSniffer/LogServer.cs
+++ b/KancolleSniffer/Net/LogServer.cs
@@ -20,8 +20,10 @@ using System.Linq;
 using System.Net.Sockets;\r
 using System.Text;\r
 using System.Text.RegularExpressions;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Util;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Net\r
 {\r
     public class LogServer\r
     {\r

diff --git a/KancolleSniffer/ProxyManager.cs b/KancolleSniffer/Net/ProxyManager.cs
similarity index 96%
rename from KancolleSniffer/ProxyManager.cs
rename to KancolleSniffer/Net/ProxyManager.cs
index 56ad515..25db943 100644 (file)
--- a/KancolleSniffer/ProxyManager.cs
+++ b/KancolleSniffer/Net/ProxyManager.cs
@@ -19,7 +19,7 @@ using System.Net.Sockets;
 using System.Windows.Forms;\r
 using Microsoft.Win32;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Net\r
 {\r
     public class ProxyManager\r
     {\r

diff --git a/KancolleSniffer/PushNotification.cs b/KancolleSniffer/Net/PushNotification.cs
similarity index 95%
rename from KancolleSniffer/PushNotification.cs
rename to KancolleSniffer/Net/PushNotification.cs
index b5a3465..fc55d26 100644 (file)
--- a/KancolleSniffer/PushNotification.cs
+++ b/KancolleSniffer/Net/PushNotification.cs
@@ -17,7 +17,7 @@ using System.Net;
 using System.Runtime.CompilerServices;\r
 using System.Text;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Net\r
 {\r
     public static class PushNotification\r
     {\r

diff --git a/KancolleSniffer/SystemProxy.cs b/KancolleSniffer/Net/SystemProxy.cs
similarity index 97%
rename from KancolleSniffer/SystemProxy.cs
rename to KancolleSniffer/Net/SystemProxy.cs
index b24709d..589d848 100644 (file)
--- a/KancolleSniffer/SystemProxy.cs
+++ b/KancolleSniffer/Net/SystemProxy.cs
@@ -17,7 +17,7 @@ using System.Runtime.InteropServices;
 using Microsoft.Win32;\r
 using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Net\r
 {\r
     public class SystemProxy\r
     {\r

diff --git a/KancolleSniffer/NotificationConfigDialog.cs b/KancolleSniffer/NotificationConfigDialog.cs
index 0c67c7b..a8289bf 100644 (file)
--- a/KancolleSniffer/NotificationConfigDialog.cs
+++ b/KancolleSniffer/NotificationConfigDialog.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.View;\r
 \r
 namespace KancolleSniffer\r
 {\r

diff --git a/KancolleSniffer/NotificationManager.cs b/KancolleSniffer/NotificationManager.cs
index 1114ec6..883336b 100644 (file)
--- a/KancolleSniffer/NotificationManager.cs
+++ b/KancolleSniffer/NotificationManager.cs
@@ -16,6 +16,7 @@ using System;
 using System.Collections.Generic;\r
 using System.IO;\r
 using System.Linq;\r
+using KancolleSniffer.Util;\r
 \r
 namespace KancolleSniffer\r
 {\r

diff --git a/KancolleSniffer/Program.cs b/KancolleSniffer/Program.cs
index d2fbb06..9f969f5 100644 (file)
--- a/KancolleSniffer/Program.cs
+++ b/KancolleSniffer/Program.cs
@@ -14,6 +14,7 @@
 \r
 using System;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Util;\r
 \r
 namespace KancolleSniffer\r
 {\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index e4dad0c..94031d9 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -13,8 +13,11 @@
 // limitations under the License.\r
 \r
 using System;\r
+using KancolleSniffer.Util;\r
+using KancolleSniffer.View;\r
 using System.Collections.Generic;\r
 using System.Linq;\r
+using KancolleSniffer.Model;\r
 \r
 namespace KancolleSniffer\r
 {\r

diff --git a/KancolleSniffer/TextGenerator.cs b/KancolleSniffer/TextGenerator.cs
index ef3950c..7a4d329 100644 (file)
--- a/KancolleSniffer/TextGenerator.cs
+++ b/KancolleSniffer/TextGenerator.cs
@@ -16,6 +16,7 @@ using System.Collections.Generic;
 using System.IO;\r
 using System.Linq;\r
 using System.Text;\r
+using KancolleSniffer.Model;\r
 \r
 namespace KancolleSniffer\r
 {\r

diff --git a/KancolleSniffer/Ascii85.cs b/KancolleSniffer/Util/Ascii85.cs
similarity index 95%
rename from KancolleSniffer/Ascii85.cs
rename to KancolleSniffer/Util/Ascii85.cs
index 07f9b6a..58a000f 100644 (file)
--- a/KancolleSniffer/Ascii85.cs
+++ b/KancolleSniffer/Util/Ascii85.cs
@@ -15,7 +15,7 @@
 using System;\r
 using System.Text;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Util\r
 {\r
     public static class Ascii85\r
     {\r

diff --git a/KancolleSniffer/CUDColor.cs b/KancolleSniffer/Util/CUDColor.cs
similarity index 92%
rename from KancolleSniffer/CUDColor.cs
rename to KancolleSniffer/Util/CUDColor.cs
index 34e76c6..08c9c98 100644 (file)
--- a/KancolleSniffer/CUDColor.cs
+++ b/KancolleSniffer/Util/CUDColor.cs
@@ -1,6 +1,6 @@
 using System.Drawing;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Util\r
 {\r
     /// <summary>\r
     /// カラーユニバーサルデザイン推奨配色セットの色を定義する。\r

diff --git a/KancolleSniffer/HttpUtility.cs b/KancolleSniffer/Util/HttpUtility.cs
similarity index 95%
rename from KancolleSniffer/HttpUtility.cs
rename to KancolleSniffer/Util/HttpUtility.cs
index 7b717ae..144a392 100644 (file)
--- a/KancolleSniffer/HttpUtility.cs
+++ b/KancolleSniffer/Util/HttpUtility.cs
@@ -17,7 +17,7 @@ using System.Collections.Specialized;
 using System.Globalization;\r
 using System.Text;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Util\r
 {\r
     public class HttpUtility\r
     {\r

diff --git a/KancolleSniffer/JsonParser.cs b/KancolleSniffer/Util/JsonParser.cs
similarity index 96%
rename from KancolleSniffer/JsonParser.cs
rename to KancolleSniffer/Util/JsonParser.cs
index b3884de..362e8ea 100644 (file)
--- a/KancolleSniffer/JsonParser.cs
+++ b/KancolleSniffer/Util/JsonParser.cs
@@ -8,7 +8,7 @@ using System.Reflection;
 using System.Text;\r
 using System.Text.RegularExpressions;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Util\r
 {\r
     public class JsonParser\r
     {\r

diff --git a/KancolleSniffer/Win32API.cs b/KancolleSniffer/Util/Win32API.cs
similarity index 96%
rename from KancolleSniffer/Win32API.cs
rename to KancolleSniffer/Util/Win32API.cs
index cc90f4d..31a5f18 100644 (file)
--- a/KancolleSniffer/Win32API.cs
+++ b/KancolleSniffer/Util/Win32API.cs
@@ -17,7 +17,7 @@ using System.ComponentModel;
 using System.Diagnostics;\r
 using System.Runtime.InteropServices;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.Util\r
 {\r
     public class Win32API\r
     {\r

diff --git a/KancolleSniffer/AirBattleResultPanel.cs b/KancolleSniffer/View/AirBattleResultPanel.cs
similarity index 96%
rename from KancolleSniffer/AirBattleResultPanel.cs
rename to KancolleSniffer/View/AirBattleResultPanel.cs
index 7212d05..cd2ef4c 100644 (file)
--- a/KancolleSniffer/AirBattleResultPanel.cs
+++ b/KancolleSniffer/View/AirBattleResultPanel.cs
@@ -17,10 +17,11 @@ using System.Collections.Generic;
 using System.ComponentModel;\r
 using System.Drawing;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Util;\r
 \r
 // ReSharper disable CoVariantArrayConversion\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     public class AirBattleResult\r
     {\r

diff --git a/KancolleSniffer/AntiAirPanel.cs b/KancolleSniffer/View/AntiAirPanel.cs
similarity index 92%
rename from KancolleSniffer/AntiAirPanel.cs
rename to KancolleSniffer/View/AntiAirPanel.cs
index a2f6dde..ca6278b 100644 (file)
--- a/KancolleSniffer/AntiAirPanel.cs
+++ b/KancolleSniffer/View/AntiAirPanel.cs
@@ -18,7 +18,7 @@ using System.Drawing;
 using System.Linq;\r
 using System.Windows.Forms;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     public class AntiAirPanel : Panel\r
     {\r
@@ -59,7 +59,10 @@ namespace KancolleSniffer
                 var ships = fleet.Ships;\r
                 var rawForFleet = ships.Sum(ship => ship.EffectiveAntiAirForFleet);\r
                 var forFleet = new[] {1.0, 1.2, 1.6}.Select(r => (int)(rawForFleet * r) * 2 / 1.3).ToArray();\r
-                _table.Add(new Record {Fleet = fn[fleet.Number] + " : " + string.Join("/", forFleet.Select(x => x.ToString("f1")))});\r
+                _table.Add(new Record\r
+                {\r
+                    Fleet = fn[fleet.Number] + " : " + string.Join("/", forFleet.Select(x => x.ToString("f1")))\r
+                });\r
                 foreach (var ship in ships)\r
                 {\r
                     var rate = ship.EffectiveAntiAirForShip / 4.0;\r
@@ -68,7 +71,7 @@ namespace KancolleSniffer
                     {\r
                         Ship = ship.Name + " Lv" + ship.Level +\r
                                " : " + ship.EffectiveAntiAirForShip.ToString("d"),\r
-                        Id = ship.Id,\r
+                        Id = ship.Id\r
                     });\r
                     _table.Add(new Record\r
                     {\r
@@ -102,7 +105,7 @@ namespace KancolleSniffer
                 new ShipLabel {Location = new Point(1, 3), AutoSize = true},\r
                 new ShipLabel {Location = new Point(10, 3), AutoSize = true},\r
                 new ShipLabel {Location = new Point(35, 3), AutoSize = true},\r
-                new ShipLabel {Location = new Point(100, 3), AutoSize = true},\r
+                new ShipLabel {Location = new Point(100, 3), AutoSize = true}\r
             };\r
             _labelList.Add(labels);\r
             _panelList.Add(lbp);\r

diff --git a/KancolleSniffer/BattleResultPanel.cs b/KancolleSniffer/View/BattleResultPanel.cs
similarity index 97%
rename from KancolleSniffer/BattleResultPanel.cs
rename to KancolleSniffer/View/BattleResultPanel.cs
index b1ac480..d60bd71 100644 (file)
--- a/KancolleSniffer/BattleResultPanel.cs
+++ b/KancolleSniffer/View/BattleResultPanel.cs
@@ -18,9 +18,10 @@ using System.Drawing;
 using System.Linq;\r
 using System.Text.RegularExpressions;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Model;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     public class BattleResultPanel : Panel\r
     {\r

diff --git a/KancolleSniffer/FleetPanel.cs b/KancolleSniffer/View/FleetPanel.cs
similarity index 96%
rename from KancolleSniffer/FleetPanel.cs
rename to KancolleSniffer/View/FleetPanel.cs
index 5ea1509..58bbe8b 100644 (file)
--- a/KancolleSniffer/FleetPanel.cs
+++ b/KancolleSniffer/View/FleetPanel.cs
@@ -18,8 +18,9 @@ using System.Collections.Generic;
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Model;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     public class FleetPanel : Panel\r
     {\r
@@ -165,7 +166,9 @@ namespace KancolleSniffer
                              " 潜" + CutOverFlow(total.AntiSubmarine) +\r
                              " 索" + CutOverFlow(total.LoS) + "\r\n" +\r
                              $"戦闘:燃{total.Fuel / 5}弾{total.Bull / 5} 支援:燃{total.Fuel / 2}弾{(int)(total.Bull * 0.8)}" +\r
-                             (sniffer.IsCombinedFleet && fleet.Number == 1 ? "" : $"\r\nTP:S{(int)tp} A{(int)(tp * 0.7)}")\r
+                             (sniffer.IsCombinedFleet && fleet.Number == 1\r
+                                 ? ""\r
+                                 : $"\r\nTP:S{(int)tp} A{(int)(tp * 0.7)}")\r
                 });\r
                 list.AddRange(ships);\r
             }\r

diff --git a/KancolleSniffer/ItemTreeView.cs b/KancolleSniffer/View/ItemTreeView.cs
similarity index 96%
rename from KancolleSniffer/ItemTreeView.cs
rename to KancolleSniffer/View/ItemTreeView.cs
index 9d440fb..573fcd7 100644 (file)
--- a/KancolleSniffer/ItemTreeView.cs
+++ b/KancolleSniffer/View/ItemTreeView.cs
@@ -18,8 +18,9 @@ using System.Collections.Generic;
 using System.Linq;\r
 using System.Runtime.InteropServices;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Model;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     public class ItemTreeView : TreeView\r
     {\r

diff --git a/KancolleSniffer/MainFormLabels.cs b/KancolleSniffer/View/MainFormLabels.cs
similarity index 97%
rename from KancolleSniffer/MainFormLabels.cs
rename to KancolleSniffer/View/MainFormLabels.cs
index d4c23e2..10f3533 100644 (file)
--- a/KancolleSniffer/MainFormLabels.cs
+++ b/KancolleSniffer/View/MainFormLabels.cs
@@ -16,9 +16,11 @@ using System;
 using System.Collections.Generic;\r
 using System.Drawing;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Util;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     /// <summary>\r
     /// 艦娘名の横幅\r

diff --git a/KancolleSniffer/MiscTextInfo.cs b/KancolleSniffer/View/MiscTextInfo.cs
similarity index 96%
rename from KancolleSniffer/MiscTextInfo.cs
rename to KancolleSniffer/View/MiscTextInfo.cs
index ecc541b..c7e8a07 100644 (file)
--- a/KancolleSniffer/MiscTextInfo.cs
+++ b/KancolleSniffer/View/MiscTextInfo.cs
@@ -14,9 +14,10 @@
 \r
 using System.Collections.Generic;\r
 using System.Linq;\r
+using KancolleSniffer.Model;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     public class MiscTextInfo\r
     {\r

diff --git a/KancolleSniffer/RepairListForMain.cs b/KancolleSniffer/View/RepairListForMain.cs
similarity index 93%
rename from KancolleSniffer/RepairListForMain.cs
rename to KancolleSniffer/View/RepairListForMain.cs
index 81368e2..aeb2299 100644 (file)
--- a/KancolleSniffer/RepairListForMain.cs
+++ b/KancolleSniffer/View/RepairListForMain.cs
@@ -18,9 +18,10 @@ using System.Collections.Generic;
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Model;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     public class RepairListForMain : Panel\r
     {\r
@@ -148,7 +149,8 @@ namespace KancolleSniffer
         private void SetPanelHeight()\r
         {\r
             var lines = Min(Max(1, _repairList.Length), _repairLabels.Length);\r
-            Size = new Size(Width, (int)Round(ShipLabel.ScaleFactor.Height * lines * LineHeight + PanelPadding * 2));\r
+            Size = new Size(Width,\r
+                (int)Round(ShipLabel.ScaleFactor.Height * lines * LineHeight + PanelPadding * 2));\r
         }\r
 \r
         public void ShowRepairList()\r
@@ -193,7 +195,8 @@ namespace KancolleSniffer
                 g.FillPolygon(bottomBrush,\r
                     new[]\r
                     {\r
-                        new PointF(Width * 0.45f, Height - PanelPadding - 2), new PointF(Width * 0.55f, Height - PanelPadding - 2),\r
+                        new PointF(Width * 0.45f, Height - PanelPadding - 2),\r
+                        new PointF(Width * 0.55f, Height - PanelPadding - 2),\r
                         new PointF(Width * 0.5f, Height - 2), new PointF(Width * 0.45f, Height - PanelPadding - 2)\r
                     });\r
             }\r

diff --git a/KancolleSniffer/ResizableToolTip.cs b/KancolleSniffer/View/ResizableToolTip.cs
similarity index 96%
rename from KancolleSniffer/ResizableToolTip.cs
rename to KancolleSniffer/View/ResizableToolTip.cs
index be682bd..e49be8e 100644 (file)
--- a/KancolleSniffer/ResizableToolTip.cs
+++ b/KancolleSniffer/View/ResizableToolTip.cs
@@ -17,7 +17,7 @@ using System.Drawing;
 using System.Runtime.InteropServices;\r
 using System.Windows.Forms;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     public class ResizableToolTip : ToolTip\r
     {\r

diff --git a/KancolleSniffer/ShipLabel.cs b/KancolleSniffer/View/ShipLabel.cs
similarity index 94%
rename from KancolleSniffer/ShipLabel.cs
rename to KancolleSniffer/View/ShipLabel.cs
index 3b8ca01..216cf81 100644 (file)
--- a/KancolleSniffer/ShipLabel.cs
+++ b/KancolleSniffer/View/ShipLabel.cs
@@ -18,9 +18,11 @@ using System.Drawing;
 using System.Linq;\r
 using System.Text.RegularExpressions;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Util;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     [DesignerCategory("Code")]\r
     public class ShipLabel : Label\r
@@ -71,7 +73,8 @@ namespace KancolleSniffer
                     empty |= SlotStatus.ExtraEmpty;\r
             }\r
             var dc = status.PreparedDamageControl;\r
-            var dcname = dc == 42 ? "[ダ]" : dc == 43 ? "[メ]" : "";\r
+            var dcname = dc == 42 ? "[ダ]" :\r
+                dc == 43 ? "[メ]" : "";\r
             SetName(status.Escaped ? "[避]" : dcname, status.Name, empty, width);\r
         }\r
 \r

diff --git a/KancolleSniffer/ShipListPanel.cs b/KancolleSniffer/View/ShipListPanel.cs
similarity index 97%
rename from KancolleSniffer/ShipListPanel.cs
rename to KancolleSniffer/View/ShipListPanel.cs
index ce0b10b..1acc87a 100644 (file)
--- a/KancolleSniffer/ShipListPanel.cs
+++ b/KancolleSniffer/View/ShipListPanel.cs
@@ -18,9 +18,10 @@ using System.Drawing;
 using System.Linq;\r
 using System.Runtime.InteropServices;\r
 using System.Windows.Forms;\r
+using KancolleSniffer.Model;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     public class ShipListPanel : Panel\r
     {\r

diff --git a/KancolleSniffer/SwipeScrollify.cs b/KancolleSniffer/View/SwipeScrollify.cs
similarity index 95%
rename from KancolleSniffer/SwipeScrollify.cs
rename to KancolleSniffer/View/SwipeScrollify.cs
index f0ed97e..fea57a4 100644 (file)
--- a/KancolleSniffer/SwipeScrollify.cs
+++ b/KancolleSniffer/View/SwipeScrollify.cs
@@ -18,7 +18,7 @@ using System.Runtime.InteropServices;
 using System.Windows.Forms;\r
 using static System.Math;\r
 \r
-namespace KancolleSniffer\r
+namespace KancolleSniffer.View\r
 {\r
     public class SwipeScrollify\r
     {\r
@@ -58,11 +58,12 @@ namespace KancolleSniffer
         {\r
             public delegate void MouseHandler(IntPtr handle, ref bool handled);\r
 \r
-            public event MouseHandler MouseMove , MouseDown , MouseUp;\r
+            public event MouseHandler MouseMove, MouseDown, MouseUp;\r
 \r
             // ReSharper disable InconsistentNaming\r
             private const int WM_MOUSEMOVE = 0x0200;\r
             private const int WM_LBUTTONDOWN = 0x0201;\r
+\r
             private const int WM_LBUTTONUP = 0x0202;\r
             // ReSharper restore InconsistentNaming\r
 \r
@@ -130,7 +131,7 @@ namespace KancolleSniffer
                 {\r
                     if (!(Abs(dx) > ScrollCount || Abs(dy) > ScrollCount))\r
                         return;\r
-                   _touch = true;\r
+                    _touch = true;\r
                 }\r
                 if (Abs(_scrollStart.X - cur.X) > ScrollCount || Abs(_scrollStart.Y - cur.Y) > ScrollCount)\r
                 {\r
@@ -145,6 +146,7 @@ namespace KancolleSniffer
                 _mouseStart = _panelStart = Point.Empty;\r
             }\r
         }\r
+\r
         private class ShipListPanelHandler\r
         {\r
             private readonly ShipListPanel _panel;\r
@@ -166,7 +168,8 @@ namespace KancolleSniffer
                 if (!_mouseStart.IsEmpty)\r
                     return;\r
                 if (!_panel.RectangleToScreen(_panel.ClientRectangle).Contains(Control.MousePosition) ||\r
-                    _panel.ScrollBar.RectangleToScreen(_panel.ScrollBar.ClientRectangle).Contains(Control.MousePosition))\r
+                    _panel.ScrollBar.RectangleToScreen(_panel.ScrollBar.ClientRectangle)\r
+                        .Contains(Control.MousePosition))\r
                     return;\r
                 var found = false;\r
                 for (var control = Control.FromHandle(handle); control != null; control = control.Parent)\r
@@ -226,6 +229,7 @@ namespace KancolleSniffer
             // ReSharper disable InconsistentNaming\r
             private const int GWL_STYLE = -16;\r
             private const int WS_HSCROLL = 0x00100000;\r
+\r
             private const int WS_VSCROLL = 0x00200000;\r
             // ReSharper restore InconsistentNaming\r
 \r