CodeMaid& XamlStyler CleanUp

huoyaoyuan · Nov 30, 2015 · 35cd3ff · 35cd3ff
1 parent 5a76f8f
commit 35cd3ff
Show file tree

Hide file tree

Showing 69 changed files with 798 additions and 891 deletions.
diff --git a/.gitignore b/.gitignore
@@ -194,3 +194,6 @@ FakesAssemblies/
 
 # Visual Studio 6 workspace options file
 *.opt
+
+#CodeMaid
+CodeMaid.config
diff --git a/AdmiralRoom/API/api_ship.cs b/AdmiralRoom/API/api_ship.cs
@@ -34,4 +34,4 @@ public class api_ship
         public int api_locked_equip { get; set; }
         public int api_sally_area { get; set; }//イベント中のみ存在
     }
-}
+}
diff --git a/AdmiralRoom/API/api_start2.cs b/AdmiralRoom/API/api_start2.cs
@@ -156,7 +156,7 @@ public class api_mst_shipupgrade
         public int api_id { get; set; }
         public int api_current_ship_id { get; set; }
         public int api_original_ship_id { get; set; }
-        public int api_upgrade_type{ get; set; }
+        public int api_upgrade_type { get; set; }
         public int api_upgrade_level { get; set; }
         public int api_drawing_count { get; set; }
         public int api_catapult_count { get; set; }

diff --git a/AdmiralRoom/API/getmember_deck.cs b/AdmiralRoom/API/getmember_deck.cs
@@ -10,4 +10,4 @@ public class getmember_deck
         public int api_flagship { get; set; }
         public int[] api_ship { get; set; }
     }
-}
+}
diff --git a/AdmiralRoom/API/getmember_ndock.cs b/AdmiralRoom/API/getmember_ndock.cs
@@ -13,4 +13,4 @@ public class getmember_ndock
         public int api_item3 { get; set; }
         public int api_item4 { get; set; }
     }
-}
+}
diff --git a/AdmiralRoom/API/getmember_record.cs b/AdmiralRoom/API/getmember_record.cs
@@ -25,14 +25,12 @@ public class getmember_record
         public int api_large_dock { get; set; }
         public int api_material_max { get; set; }
     }
-
     public struct api_war
     {
         public int api_win { get; set; }
         public int api_lose { get; set; }
         public decimal api_rate { get; set; }
     }
-
     public struct api_mission
     {
         public int api_count { get; set; }

diff --git a/AdmiralRoom/API/port_port.cs b/AdmiralRoom/API/port_port.cs
@@ -13,7 +13,7 @@ public class port_port
         //public object api_event_object;
         public int api_parallel_quest_count { get; set; }
     }
-    
+
     public class api_log
     {
         public int api_no { get; set; }

diff --git a/AdmiralRoom/API/svdata.cs b/AdmiralRoom/API/svdata.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Runtime.Serialization.Json;
+using System.Runtime.Serialization.Json;
 
 namespace Huoyaoyuan.AdmiralRoom.API
 {

diff --git a/AdmiralRoom/App.xaml b/AdmiralRoom/App.xaml
@@ -1,8 +1,8 @@
 <Application x:Class="Huoyaoyuan.AdmiralRoom.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Huoyaoyuan.AdmiralRoom" ShutdownMode="OnMainWindowClose">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Huoyaoyuan.AdmiralRoom"
+             ShutdownMode="OnMainWindowClose">
     <Application.Resources>
-         <ResourceDictionary Source="Resources/StaticResources.xaml"/>
+        <ResourceDictionary Source="Resources/StaticResources.xaml"/>
     </Application.Resources>
 </Application>
diff --git a/AdmiralRoom/App.xaml.cs b/AdmiralRoom/App.xaml.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 
 namespace Huoyaoyuan.AdmiralRoom

diff --git a/AdmiralRoom/Common/UnicodeEscape.cs b/AdmiralRoom/Common/UnicodeEscape.cs
@@ -5,7 +5,7 @@ namespace Huoyaoyuan.AdmiralRoom
 {
     static class UnicodeEscape
     {
-        static Regex reUnicode = new Regex(@"\\u([0-9a-fA-F]{4})", RegexOptions.Compiled);
+        private static Regex reUnicode = new Regex(@"\\u([0-9a-fA-F]{4})", RegexOptions.Compiled);
         public static string UnicodeDecode(this string s)
         {
             return reUnicode.Replace(s, m =>

diff --git a/AdmiralRoom/Config.cs b/AdmiralRoom/Config.cs
@@ -1,7 +1,7 @@
 using System;
-using System.Xml.Serialization;
-using System.IO;
 using System.Globalization;
+using System.IO;
+using System.Xml.Serialization;
 
 namespace Huoyaoyuan.AdmiralRoom
 {

diff --git a/AdmiralRoom/ConstData.cs b/AdmiralRoom/ConstData.cs
@@ -2,15 +2,15 @@
 {
     static class ConstData
     {
-        static int[] f99exp;
-        static int[] ad100exp =
+        private static int[] f99exp;
+        private static int[] ad100exp =
         {
             1300000,1600000,1900000,2200000,2600000,3000000,
             3500000,4000000,4600000,5200000,5900000,
             6600000,7400000,8200000,9100000,10000000,
             11000000,12000000,13000000,14000000,15000000
         };
-        static int[] ship100exp;
+        private static int[] ship100exp;
         static ConstData()
         {
             //generate exp table

diff --git a/AdmiralRoom/Controls/ContentNullChooser.cs b/AdmiralRoom/Controls/ContentNullChooser.cs
@@ -5,8 +5,6 @@ namespace Huoyaoyuan.AdmiralRoom.Controls
 {
     class ContentNullChooser : ContentControl
     {
-
-
         public object NullContent
         {
             get { return GetValue(NullContentProperty); }
@@ -17,8 +15,6 @@ public object NullContent
         public static readonly DependencyProperty NullContentProperty =
             DependencyProperty.Register("NullContent", typeof(object), typeof(ContentNullChooser), new PropertyMetadata(null, OnPropertyChanged));
 
-
-
         public object NotNullContent
         {
             get { return GetValue(NotNullContentProperty); }
@@ -29,8 +25,6 @@ public object NotNullContent
         public static readonly DependencyProperty NotNullContentProperty =
             DependencyProperty.Register("NotNullContent", typeof(object), typeof(ContentNullChooser), new PropertyMetadata(null, OnPropertyChanged));
 
-
-
         public object ContentChooser
         {
             get { return GetValue(ContentChooserProperty); }

diff --git a/AdmiralRoom/Controls/ExpBar.xaml b/AdmiralRoom/Controls/ExpBar.xaml
@@ -1,10 +1,7 @@
 <UserControl x:Class="Huoyaoyuan.AdmiralRoom.Controls.ExpBar"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Huoyaoyuan.AdmiralRoom.Controls"
-             mc:Ignorable="d" 
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Huoyaoyuan.AdmiralRoom.Controls"
+             mc:Ignorable="d"
              x:Name="control">
     <UserControl.ToolTip>
         <TextBlock x:Name="ToolTipText"/>

diff --git a/AdmiralRoom/Controls/ExpBar.xaml.cs b/AdmiralRoom/Controls/ExpBar.xaml.cs
@@ -14,7 +14,6 @@ public ExpBar()
             InitializeComponent();
         }
 
-
         public Exp Exp
         {
             get { return (Exp)GetValue(ExpProperty); }
@@ -62,7 +61,5 @@ public int Level
         // Using a DependencyProperty as the backing store for Level.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty LevelProperty =
             DependencyProperty.Register("Level", typeof(int), typeof(ExpBar), new PropertyMetadata());
-
-
     }
 }
diff --git a/AdmiralRoom/Controls/PredicateProgressBar.cs b/AdmiralRoom/Controls/PredicateProgressBar.cs
@@ -12,7 +12,6 @@ static PredicateProgressBar()
             MaximumProperty.OverrideMetadata(typeof(PredicateProgressBar), new FrameworkPropertyMetadata(100.0));
         }
 
-
         public double PredictValue
         {
             get { return (double)GetValue(PredictValueProperty); }
@@ -23,8 +22,6 @@ public double PredictValue
         public static readonly DependencyProperty PredictValueProperty =
             DependencyProperty.Register("PredictValue", typeof(double), typeof(PredicateProgressBar), new PropertyMetadata(0.0));
 
-
-
         public Brush PredictForeground
         {
             get { return (Brush)GetValue(PredictForegroundProperty); }
@@ -34,6 +31,5 @@ public Brush PredictForeground
         // Using a DependencyProperty as the backing store for PredictForeground.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty PredictForegroundProperty =
             DependencyProperty.Register("PredictForeground", typeof(Brush), typeof(PredicateProgressBar), new PropertyMetadata(new SolidColorBrush(Colors.Aqua)));
-
     }
 }
diff --git a/AdmiralRoom/Icons/VectorIcons.xaml b/AdmiralRoom/Icons/VectorIcons.xaml
@@ -1,5 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <DrawingImage x:Key="IconBack">
         <DrawingImage.Drawing>
             <DrawingGroup>
@@ -95,4 +94,4 @@
             </DrawingGroup>
         </DrawingImage.Drawing>
     </DrawingImage>
-</ResourceDictionary>
+</ResourceDictionary>
diff --git a/AdmiralRoom/KanColleBrowser.xaml b/AdmiralRoom/KanColleBrowser.xaml
@@ -1,9 +1,6 @@
 <UserControl x:Class="Huoyaoyuan.AdmiralRoom.KanColleBrowser"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Huoyaoyuan.AdmiralRoom"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Huoyaoyuan.AdmiralRoom"
              mc:Ignorable="d">
     <WebBrowser x:Name="WebBrowser"/>
 </UserControl>
diff --git a/AdmiralRoom/KanColleBrowser.xaml.cs b/AdmiralRoom/KanColleBrowser.xaml.cs
@@ -247,14 +247,14 @@ public void ApplyZoomFactor(double zoomFactor)
             }
             UpdateSize();
         }
-        void SetAllowDrop(bool allowdrop)
+        private void SetAllowDrop(bool allowdrop)
         {
             var axIWebBrowser2Prop = typeof(WebBrowser).GetProperty("AxIWebBrowser2", BindingFlags.Instance | BindingFlags.NonPublic);
             dynamic axIWebBrowser2 = axIWebBrowser2Prop.GetValue(this.WebBrowser);
             axIWebBrowser2.RegisterAsDropTarget = allowdrop;
             //axIWebBrowser2.GetType().InvokeMember("RegisterAsDropTarget", BindingFlags.SetProperty, null, axIWebBrowser2, new object[] { false });
         }
-        void SetSilence(bool issilence)
+        private void SetSilence(bool issilence)
         {
             var axIWebBrowser2Prop = typeof(WebBrowser).GetProperty("AxIWebBrowser2", BindingFlags.Instance | BindingFlags.NonPublic);
             dynamic axIWebBrowser2 = axIWebBrowser2Prop.GetValue(this.WebBrowser);
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,4 +34,4 @@ public class api_ship @@
             public int api_locked_equip { get; set; }
             public int api_sally_area { get; set; }//イベント中のみ存在
         }
-    }
+    }