Major Code Cleanup

angelics · Jan 14, 2018 · 923e295 · 923e295
1 parent 18661ba
commit 923e295
Show file tree

Hide file tree

Showing 202 changed files with 7,319 additions and 5,077 deletions.
diff --git a/3rdparty/DownloadManager/MyDownloader.Core/CalculatedSegment.cs b/3rdparty/DownloadManager/MyDownloader.Core/CalculatedSegment.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace MyDownloader.Core
 {
@@ -26,4 +24,4 @@ public CalculatedSegment(long startPos, long endPos)
             this.startPosition = startPos;
         }
     }
-}
+}
diff --git a/3rdparty/DownloadManager/MyDownloader.Core/Common/BoolFormatter.cs b/3rdparty/DownloadManager/MyDownloader.Core/Common/BoolFormatter.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace MyDownloader.Core.Common
 {
     public static class BoolFormatter
@@ -21,4 +17,4 @@ public static string ToString(bool v)
             return No;
         }
     }
-}
+}
diff --git a/3rdparty/DownloadManager/MyDownloader.Core/Common/ByteFormatter.cs b/3rdparty/DownloadManager/MyDownloader.Core/Common/ByteFormatter.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace MyDownloader.Core.Common
 {
@@ -35,4 +33,4 @@ public static string ToString(long size)
             }
         }
     }
-}
+}
diff --git a/3rdparty/DownloadManager/MyDownloader.Core/Common/PathHelper.cs b/3rdparty/DownloadManager/MyDownloader.Core/Common/PathHelper.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 
 namespace MyDownloader.Core.Common
@@ -17,4 +14,4 @@ public static string GetWithBackslash(string path)
             return path;
         }
     }
-}
+}
diff --git a/3rdparty/DownloadManager/MyDownloader.Core/Common/TimeSpanFormatter.cs b/3rdparty/DownloadManager/MyDownloader.Core/Common/TimeSpanFormatter.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace MyDownloader.Core.Common
 {
@@ -25,4 +23,4 @@ public static string ToString(TimeSpan ts)
             }
         }
     }
-}
+}
diff --git a/3rdparty/DownloadManager/MyDownloader.Core/Concurrency/ObjectLocker.cs b/3rdparty/DownloadManager/MyDownloader.Core/Concurrency/ObjectLocker.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 
 namespace MyDownloader.Core.Concurrency
@@ -9,9 +7,9 @@ public class ObjectLocker : IDisposable
     {
         #region Fields
 
-        private object obj; 
+        private object obj;
 
-        #endregion
+        #endregion Fields
 
         #region Constructor
 
@@ -21,7 +19,7 @@ public ObjectLocker(object obj)
             Monitor.Enter(this.obj);
         }
 
-        #endregion
+        #endregion Constructor
 
         #region IDisposable Members
 
@@ -30,6 +28,6 @@ public void Dispose()
             Monitor.Exit(this.obj);
         }
 
-        #endregion
-    } 
-}
+        #endregion IDisposable Members
+    }
+}
diff --git a/3rdparty/DownloadManager/MyDownloader.Core/Concurrency/ReaderWriterObjectLocker.cs b/3rdparty/DownloadManager/MyDownloader.Core/Concurrency/ReaderWriterObjectLocker.cs
@@ -1,14 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 
 namespace MyDownloader.Core.Concurrency
 {
     public class ReaderWriterObjectLocker
     {
         #region BaseReleaser
-        class BaseReleaser
+
+        private class BaseReleaser
         {
             protected ReaderWriterObjectLocker locker;
 
@@ -17,10 +16,12 @@ public BaseReleaser(ReaderWriterObjectLocker locker)
                 this.locker = locker;
             }
         }
-        #endregion
+
+        #endregion BaseReleaser
 
         #region ReaderReleaser
-        class ReaderReleaser : BaseReleaser, IDisposable
+
+        private class ReaderReleaser : BaseReleaser, IDisposable
         {
             public ReaderReleaser(ReaderWriterObjectLocker locker)
                 : base(locker)
@@ -34,12 +35,14 @@ public void Dispose()
                 locker.locker.ReleaseReaderLock();
             }
 
-            #endregion
+            #endregion IDisposable Members
         }
-        #endregion
+
+        #endregion ReaderReleaser
 
         #region WriterReleaser
-        class WriterReleaser : BaseReleaser, IDisposable
+
+        private class WriterReleaser : BaseReleaser, IDisposable
         {
             public WriterReleaser(ReaderWriterObjectLocker locker)
                 : base(locker)
@@ -53,28 +56,34 @@ public void Dispose()
                 locker.locker.ReleaseWriterLock();
             }
 
-            #endregion
+            #endregion IDisposable Members
         }
-        #endregion
+
+        #endregion WriterReleaser
 
         #region Fields
+
         private ReaderWriterLock locker;
         private IDisposable writerReleaser;
-        private IDisposable readerReleaser; 
-        #endregion
+        private IDisposable readerReleaser;
+
+        #endregion Fields
 
         #region Constructor
+
         public ReaderWriterObjectLocker()
         {
             // TODO: update to ReaderWriterLockSlim on .net 3.5
             locker = new ReaderWriterLock();
 
             writerReleaser = new WriterReleaser(this);
             readerReleaser = new ReaderReleaser(this);
-        } 
-        #endregion
+        }
+
+        #endregion Constructor
 
         #region Methods
+
         public IDisposable LockForRead()
         {
             locker.AcquireReaderLock(-1);
@@ -87,7 +96,8 @@ public IDisposable LockForWrite()
             locker.AcquireWriterLock(-1);
 
             return writerReleaser;
-        } 
-        #endregion
+        }
+
+        #endregion Methods
     }
-}
+}
diff --git a/3rdparty/DownloadManager/MyDownloader.Core/DownloadManager.cs b/3rdparty/DownloadManager/MyDownloader.Core/DownloadManager.cs
@@ -1,10 +1,7 @@
+using MyDownloader.Core.Concurrency;
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Collections.ObjectModel;
-using System.Collections;
-using System.Threading;
-using MyDownloader.Core.Concurrency;
 
 namespace MyDownloader.Core
 {
@@ -20,17 +17,17 @@ public static DownloadManager Instance
             {
                 return instance;
             }
-        } 
+        }
 
-        #endregion
+        #endregion Singleton
 
         #region Fields
-        
+
         private List<Downloader> downloads = new List<Downloader>();
         private int addBatchCount;
         private ReaderWriterObjectLocker downloadListSync = new ReaderWriterObjectLocker();
 
-        #endregion
+        #endregion Fields
 
         #region Properties
 
@@ -54,7 +51,7 @@ public ReadOnlyCollection<Downloader> Downloads
 
         public double TotalDownloadRate
         {
-            get 
+            get
             {
                 double total = 0;
 
@@ -69,7 +66,7 @@ public double TotalDownloadRate
                     }
                 }
 
-                return total; 
+                return total;
             }
         }
 
@@ -81,11 +78,13 @@ public int AddBatchCount
             }
         }
 
-        #endregion 
+        #endregion Properties
+
+
 
         #region Methods
 
-        void downloader_StateChanged(object sender, EventArgs e)
+        private void downloader_StateChanged(object sender, EventArgs e)
         {
             Downloader downloader = (Downloader)sender;
 
@@ -266,8 +265,6 @@ private void InternalSwap(int idx)
             this.downloads.Insert(idx, it2);
         }
 
-        #endregion
-
-
+        #endregion Methods
     }
-}
+}