Code cleanup.

toncijukic_cp · toncijukic_cp · commit b5b55e3ef802 · 2012-10-15T22:39:29.000Z
diff --git a/Class Library/ActiveUp.Net.Common/AddressCollection.cs b/Class Library/ActiveUp.Net.Common/AddressCollection.cs
@@ -28,15 +28,7 @@ namespace ActiveUp.Net.Mail
 #endif
     public class AddressCollection : List<Address>
 	{
-		/// <summary>
-		/// The default constructor.
-		/// </summary>
-		public AddressCollection()
-		{
-			//
-		}
-		
-		/// <summary>
+	    /// <summary>
 		/// Allows the developer to add a collection of Address objects in another one.
 		/// </summary>
 		/// <param name="first">The first collection.</param>
diff --git a/Class Library/ActiveUp.Net.Common/Attachment.cs b/Class Library/ActiveUp.Net.Common/Attachment.cs
@@ -29,14 +29,7 @@ public class Attachment : ActiveUp.Net.Mail.MimePart
 	{
 		bool _isLoaded = false;
 		string _originalPath;
-		/// <summary>
-		/// Default constructor.
-		/// </summary>
-		public Attachment()
-		{
-
-		}
-		/*/// <summary>
+	    /*/// <summary>
 		/// Constructor.
 		/// </summary>
 		/// <param name="filePath">Path of the file to be treated as an attachment.</param>
diff --git a/Class Library/ActiveUp.Net.Common/AttachmentCollection.cs b/Class Library/ActiveUp.Net.Common/AttachmentCollection.cs
@@ -25,14 +25,7 @@ namespace ActiveUp.Net.Mail
 #endif
     public class AttachmentCollection : MimePartCollection
 	{
-		/// <summary>
-		/// Default constructor.
-		/// </summary>
-		public AttachmentCollection()
-		{
-
-		}
-		/// <summary>
+	    /// <summary>
 		/// Add a MimePart to the attachment collection.
 		/// </summary>
 		/// <param name="part"></param>
diff --git a/Class Library/ActiveUp.Net.Common/BodyTemplateCollection.cs b/Class Library/ActiveUp.Net.Common/BodyTemplateCollection.cs
@@ -27,17 +27,7 @@ namespace ActiveUp.Net.Mail
 #endif
     public class BodyTemplateCollection : System.Collections.CollectionBase
 	{
-		/// <summary>
-		/// The default constructor.
-		/// </summary>
-		public BodyTemplateCollection()
-		{
-			//
-			// TODO: Add constructor logic here
-			//
-		}
-
-		/// <summary>
+	    /// <summary>
 		/// Add a templated body in the collection.
 		/// </summary>
 		public void Add(BodyTemplate bodyTemplate)
diff --git a/Class Library/ActiveUp.Net.Common/BounceResult.cs b/Class Library/ActiveUp.Net.Common/BounceResult.cs
@@ -27,7 +27,7 @@ namespace ActiveUp.Net.Mail
 #endif
 	public class BounceResult
 	{
-		private int _level = 0;
+		private int _level;
 		private string _email = string.Empty;
 
 
diff --git a/Class Library/ActiveUp.Net.Common/Codec.cs b/Class Library/ActiveUp.Net.Common/Codec.cs
@@ -73,8 +73,6 @@ public static string ToQuotedPrintable(string input, string fromCharset)
                 byte[] body = GetEncoding(fromCharset).GetBytes(input);
                 int index = 0, wrap = 0, check = 0;
 
-                byte decim = 0;
-
                 for (index = 0; index < body.Length; index++)
                 {
                     if (wrap == 0 && index + 73 - check < body.Length)
@@ -90,7 +88,7 @@ public static string ToQuotedPrintable(string input, string fromCharset)
                         check = 0;
                     }
 
-                    decim = body[index];
+                    byte decim = body[index];
                     if ((decim < 33 || decim == 61 || decim > 126) && decim != 32)
                         sb.Append("=" + decim.ToString("X").PadLeft(2, '0'));
                     else
diff --git a/Class Library/ActiveUp.Net.Common/ConditionalCollection.cs b/Class Library/ActiveUp.Net.Common/ConditionalCollection.cs
@@ -36,17 +36,7 @@ namespace ActiveUp.Net.Mail
 #endif
     public class ConditionalCollection : System.Collections.CollectionBase
 	{
-		/// <summary>
-		/// The default constructor.
-		/// </summary>
-		public ConditionalCollection()
-		{
-			//
-			// TODO: Add constructor logic here
-			//
-		}
-
-		/// <summary>
+	    /// <summary>
 		/// Add an Condition object in the collection.
 		/// </summary>
 		/// <param name="condition">The Condition.</param>
@@ -175,14 +165,7 @@ public void ClearMatch()
 		{
 			foreach (Condition condition in List)
 			{
-				if (condition.Operator == OperatorType.NotExists) 
-				{
-					condition.Match = true;
-				}
-				else 
-				{
-					condition.Match = false;
-				}
+				condition.Match = condition.Operator == OperatorType.NotExists;
 			}
 		}
 		/// <summary>
diff --git a/Class Library/ActiveUp.Net.Common/ContentType.cs b/Class Library/ActiveUp.Net.Common/ContentType.cs
@@ -27,11 +27,6 @@ namespace ActiveUp.Net.Mail
 #endif
     public class ContentType : StructuredHeaderField
     {
-        public ContentType()
-        {
-
-        }
-
         string _mimeType = "text/plain";
 
         public string Type
diff --git a/Class Library/ActiveUp.Net.Common/DomainKeys.Signature.cs b/Class Library/ActiveUp.Net.Common/DomainKeys.Signature.cs
@@ -43,8 +43,7 @@ public static Signature Parse(string input)
         }
         public static Signature Parse(string input, Message signedMessage)
         {
-            Signature signature;
-            signature = signedMessage != null ? new Signature(signedMessage) : new Signature();
+            Signature signature = signedMessage != null ? new Signature(signedMessage) : new Signature();
 
             MatchCollection matches = Regex.Matches(input, @"[a-zA-Z]+=[^;]+(?=(;|\Z))");
             ActiveUp.Net.Mail.Logger.AddEntry(matches.Count.ToString());
diff --git a/Class Library/ActiveUp.Net.Common/EmbeddedObjectCollection.cs b/Class Library/ActiveUp.Net.Common/EmbeddedObjectCollection.cs
@@ -25,13 +25,6 @@ namespace ActiveUp.Net.Mail
 #endif
     public class EmbeddedObjectCollection : MimePartCollection
     {
-        /// <summary>
-        /// Default constructor.
-        /// </summary>
-        public EmbeddedObjectCollection()
-        {
-
-        }
         /// <summary>
         /// Add a MimePart to the embedded objects collection.
         /// </summary>
diff --git a/Class Library/ActiveUp.Net.Common/FieldFormatCollection.cs b/Class Library/ActiveUp.Net.Common/FieldFormatCollection.cs
@@ -27,17 +27,7 @@ namespace ActiveUp.Net.Mail
 #endif
     public class FieldFormatCollection : System.Collections.CollectionBase
 	{
-		/// <summary>
-		/// The default constructor.
-		/// </summary>
-		public FieldFormatCollection()
-		{
-			//
-			// TODO: Add constructor logic here
-			//
-		}
-
-		/// <summary>
+	    /// <summary>
 		/// Add an FieldFormat object in the collection.
 		/// </summary>
 		/// <param name="fieldFormat">The FieldFormat.</param>
diff --git a/Class Library/ActiveUp.Net.Common/Header.cs b/Class Library/ActiveUp.Net.Common/Header.cs
@@ -96,17 +96,10 @@ public BounceResult GetBounceStatus()
         /// <returns>A BounceStatus object containing the level of revelance and if 100% identified, the erroneous email address.</returns>
         public BounceResult GetBounceStatus(string signaturesFilePath)
         {
-            string ressource = string.Empty;
-            
-            if (signaturesFilePath == null || signaturesFilePath == string.Empty)
-            {
-                ressource = Header.GetResource("ActiveUp.Net.Common.bouncedSignatures.xml");
-            }
-            else
-                ressource = System.IO.File.OpenText(signaturesFilePath).ReadToEnd();
-            System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
+            string ressource = string.IsNullOrEmpty(signaturesFilePath) ? Header.GetResource("ActiveUp.Net.Common.bouncedSignatures.xml") : System.IO.File.OpenText(signaturesFilePath).ReadToEnd();
+            var doc = new System.Xml.XmlDocument();
             doc.LoadXml(ressource);
-            BounceResult result = new BounceResult();
+            var result = new BounceResult();
 
             foreach (System.Xml.XmlElement el in doc.GetElementsByTagName("signature"))
             {
@@ -123,7 +116,7 @@ public BounceResult GetBounceStatus(string signaturesFilePath)
         public static string GetResource(string resource)
         {
             System.IO.Stream stm = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(resource);
-            System.IO.StreamReader reader = new System.IO.StreamReader(stm);
+            var reader = new System.IO.StreamReader(stm);
             string str = reader.ReadToEnd();
             reader.Close();
             stm.Close();
@@ -165,7 +158,7 @@ public string ToHeaderString(bool removeBlindCopies)
 
             if (this.Date.Equals(DateTime.MinValue)) this.Date = DateTime.Now;
             
-            if (this.MessageId == null || this.MessageId == string.Empty)
+            if (string.IsNullOrEmpty(this.MessageId))
                 this.MessageId = "<AU" + Codec.GetUniqueString() + "@" + System.Net.Dns.GetHostName() + ">";
 
             if (this.ContentType.MimeType.Length > 0)
@@ -1036,8 +1029,10 @@ public UsenetXrefList Xref
         {
             get
             {
-                UsenetXrefList xref = new UsenetXrefList();
-                xref.Host = this.HeaderFields["xref"].Split(' ')[0];
+                UsenetXrefList xref = new UsenetXrefList
+                                          {
+                                              Host = this.HeaderFields["xref"].Split(' ')[0]
+                                          };
                 string[] splitted = this.HeaderFields["xref"].Split(' ');
                 for (int i = 1; i < splitted.Length; i++) if (splitted[i].IndexOf(":") != -1) xref.Groups.Add(splitted[i].Split(':')[0], splitted[i].Split(':')[1]);
                 return xref;
diff --git a/Class Library/ActiveUp.Net.Common/ListTemplateCollection.cs b/Class Library/ActiveUp.Net.Common/ListTemplateCollection.cs
@@ -27,17 +27,7 @@ namespace ActiveUp.Net.Mail
 #endif
     public class ListTemplateCollection : System.Collections.CollectionBase
 	{
-		/// <summary>
-		/// The default constructor.
-		/// </summary>
-		public ListTemplateCollection()
-		{
-			//
-			// TODO: Add constructor logic here
-			//
-		}
-
-		/// <summary>
+	    /// <summary>
 		/// Add a templated list in the collection.
 		/// </summary>
 		public void Add(ListTemplate listTemplate)
diff --git a/Class Library/ActiveUp.Net.Common/Logger.cs b/Class Library/ActiveUp.Net.Common/Logger.cs
@@ -36,8 +36,8 @@ public class Logger
 	{
 		private static string _logFile = string.Empty;
 		private static ArrayList _logEntries = new ArrayList();
-		private static bool _logInMemory = false, _disabled = false, _useTraceContext = false, _useTraceConsole = false;
-		private static int _logLevel = 0;
+		private static bool _logInMemory, _disabled, _useTraceContext, _useTraceConsole;
+		private static int _logLevel;
 		private static bool _isChecked = false;
 				
 		/// <summary>
@@ -162,7 +162,7 @@ public static void AddEntry(string line)
 				logString.Append(" ");
 				logString.Append(line);
 
-				if (_logFile != null && _logFile.Length > 0)
+				if (!string.IsNullOrEmpty(_logFile))
 					AddEntryToFile(logString.ToString());
 
 #if !PocketPC
diff --git a/Class Library/ActiveUp.Net.Common/Message.cs b/Class Library/ActiveUp.Net.Common/Message.cs
@@ -464,7 +464,7 @@ public int Size
 
         private string GetEncodedMimePart(MimePart part)
         {
-            System.Text.StringBuilder sb = new System.Text.StringBuilder();
+            var sb = new System.Text.StringBuilder();
             try
             {
                 sb.Append(part.ToMimeString());
@@ -1105,10 +1105,7 @@ public override string StoreToFile(string path)
         {
             string ressource = string.Empty;
             
-            if (signaturesFilePath == null || signaturesFilePath == string.Empty)
-                ressource = Header.GetResource("ActiveUp.Net.Common.bouncedSignatures.xml");
-            else
-                ressource = System.IO.File.OpenText(signaturesFilePath).ReadToEnd();
+            ressource = string.IsNullOrEmpty(signaturesFilePath) ? Header.GetResource("ActiveUp.Net.Common.bouncedSignatures.xml") : System.IO.File.OpenText(signaturesFilePath).ReadToEnd();
 
             System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
             doc.LoadXml(ressource);
diff --git a/Class Library/ActiveUp.Net.Common/MxRecordCollection.cs b/Class Library/ActiveUp.Net.Common/MxRecordCollection.cs
@@ -26,15 +26,7 @@ namespace ActiveUp.Net.Mail
     //[Obsolete("Please use ActiveUp.Net.Dns.MXRecord instead")]
 	public class MxRecordCollection : System.Collections.CollectionBase
 	{
-		/// <summary>
-		/// The default constructor.
-		/// </summary>
-		public MxRecordCollection()
-		{
-			//
-		}
-
-		/// <summary>
+	    /// <summary>
 		/// Add a MxRecord object in the collection.
 		/// </summary>
 		/// <param name="mxRecord">The MxRecord object.</param>
diff --git a/Class Library/ActiveUp.Net.Common/Region.cs b/Class Library/ActiveUp.Net.Common/Region.cs
@@ -17,6 +17,7 @@
 
 using System;
 using System.IO;
+using System.Net;
 using System.Text.RegularExpressions;
 
 namespace ActiveUp.Net.Mail
@@ -134,18 +135,16 @@ public string LoadFileContent(string filename)
 				if (filename.ToUpper().StartsWith("HTTP://") || filename.ToUpper().StartsWith("HTTPS://"))
 				{
 					System.IO.Stream stream;
-					System.Net.WebRequest webRequest;
-					System.Net.WebResponse webResponse;
+				    System.Net.WebResponse webResponse;
 
-					webRequest = System.Net.WebRequest.Create(filename);
+					WebRequest webRequest = System.Net.WebRequest.Create(filename);
 					try 
 					{
 						webResponse = webRequest.GetResponse();
 						stream = webResponse.GetResponseStream();
 						content = new StreamReader(stream).ReadToEnd();
 						System.Text.RegularExpressions.Regex rx = new System.Text.RegularExpressions.Regex(@"<body.*?>(.*?)</body>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Multiline);
-						System.Text.RegularExpressions.MatchCollection mc;
-						mc = rx.Matches(content);
+					    MatchCollection mc = rx.Matches(content);
 						if (mc.Count > 0)
 							{
 								foreach (System.Text.RegularExpressions.Match m in mc)
diff --git a/Class Library/ActiveUp.Net.Common/RegionCollection.cs b/Class Library/ActiveUp.Net.Common/RegionCollection.cs
@@ -27,17 +27,7 @@ namespace ActiveUp.Net.Mail
     #endif
 	public class RegionCollection : System.Collections.CollectionBase
 	{
-		/// <summary>
-		/// The default constructor.
-		/// </summary>
-		public RegionCollection()
-		{
-			//
-			// TODO: Add constructor logic here
-			//
-		}
-
-		/// <summary>
+	    /// <summary>
 		/// Add an Region object in the collection.
 		/// </summary>
 		/// <param name="region">The Region.</param>
diff --git a/Class Library/ActiveUp.Net.Common/ServerCollection.cs b/Class Library/ActiveUp.Net.Common/ServerCollection.cs
@@ -27,15 +27,7 @@ namespace ActiveUp.Net.Mail
 #endif
     public class ServerCollection : System.Collections.CollectionBase
 	{
-		/// <summary>
-		/// The default constructor.
-		/// </summary>
-		public ServerCollection()
-		{
-
-		}
-
-		/// <summary>
+	    /// <summary>
 		/// Allows the developer to add a collection of Server objects in another one.
 		/// </summary>
 		/// <param name="first">The first collection.</param>
diff --git a/Class Library/ActiveUp.Net.Common/SslHandShake.cs b/Class Library/ActiveUp.Net.Common/SslHandShake.cs
@@ -67,7 +67,7 @@ public SslHandShake(string hostName) : this(hostName, System.Security.Authentica
         private System.Net.Security.LocalCertificateSelectionCallback _clientCallback;
         private System.Net.Security.RemoteCertificateValidationCallback _serverCallback;
         private System.Security.Cryptography.X509Certificates.X509CertificateCollection _clientCertificates;
-        private bool _checkRevocation = false;
+        private bool _checkRevocation;
 
         #endregion
 
diff --git a/Class Library/ActiveUp.Net.Common/Templater.cs b/Class Library/ActiveUp.Net.Common/Templater.cs
diff --git a/Class Library/ActiveUp.Net.Common/TraceInfoCollection.cs b/Class Library/ActiveUp.Net.Common/TraceInfoCollection.cs
diff --git a/Class Library/ActiveUp.Net.Common/TrustAllCertificatePolicy.cs b/Class Library/ActiveUp.Net.Common/TrustAllCertificatePolicy.cs
diff --git a/Class Library/ActiveUp.Net.Common/Validator.cs b/Class Library/ActiveUp.Net.Common/Validator.cs
diff --git a/Samples/Lib/ActiveUp.Net.Common.dll b/Samples/Lib/ActiveUp.Net.Common.dll
diff --git a/Samples/Lib/ActiveUp.Net.Dns.dll b/Samples/Lib/ActiveUp.Net.Dns.dll

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ namespace ActiveUp.Net.Mail`
`27`	`27`	`#endif`
`28`	`28`	`public class BounceResult`
`29`	`29`	`{`
`30`		`- private int _level = 0;`
	`30`	`+ private int _level;`
`31`	`31`	`private string _email = string.Empty;`
`32`	`32`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,7 @@ public static Signature Parse(string input)`
`43`	`43`	`}`
`44`	`44`	`public static Signature Parse(string input, Message signedMessage)`
`45`	`45`	`{`
`46`		`- Signature signature;`
`47`		`- signature = signedMessage != null ? new Signature(signedMessage) : new Signature();`
	`46`	`+ Signature signature = signedMessage != null ? new Signature(signedMessage) : new Signature();`
`48`	`47`
`49`	`48`	`MatchCollection matches = Regex.Matches(input, @"[a-zA-Z]+=[^;]+(?=(;\|\Z))");`
`50`	`49`	`ActiveUp.Net.Mail.Logger.AddEntry(matches.Count.ToString());`