let resharper optimize some code

Core.Test/Helper.cs

@@ -21,8 +21,6 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //  
 
-using System;
-
 using NUnit.Framework;
 
 namespace XG.Core.Test
@@ -33,8 +31,8 @@ public class Helper
 		[Test]
 		public void ShrinkFileName()
 		{
-			string fileName = "This_(is).-an_Evil)(File-_-name_[Test].txt";
-			Int64 fileSize = 440044;
+			const string fileName = "This_(is).-an_Evil)(File-_-name_[Test].txt";
+			const long fileSize = 440044;
 			string result = Core.Helper.ShrinkFileName(fileName, fileSize);
 
 			Assert.AreEqual("thisisanevilfilenametesttxt.440044/", result);

Core.Test/Object.cs

@@ -35,7 +35,7 @@ public class Object
 		[Test]
 		public void Test()
 		{
-			Core.Object obj = new Core.Object();
+			var obj = new Core.Object();
 			obj.Changed += delegate { _modified = true; };
 			AssertModified(obj, false);
 
@@ -48,8 +48,7 @@ public void Test()
 			obj.Connected = true;
 			AssertModified(obj, true);
 
-			Core.Object parent = new Core.Object();
-			parent.Guid = Guid.NewGuid();
+			var parent = new Core.Object {Guid = Guid.NewGuid()};
 
 			Assert.AreEqual(Guid.Empty, obj.ParentGuid);
 			obj.Parent = parent;

Core.Test/Objects.cs

@@ -35,13 +35,13 @@ public class Objects
 		[Test]
 		public void Test()
 		{
-			Core.Objects parent = new Core.Objects();
+			var parent = new Core.Objects();
 			parent.Added += delegate { _childAdded = true; };
 			parent.Guid = Guid.NewGuid();
 
 			AssertChildAdded(false);
 
-			Core.Object obj = new Core.Object();
+			var obj = new Core.Object();
 			Assert.AreEqual(Guid.Empty, obj.ParentGuid);
 			parent.Add(obj);
 

Core/AObject.cs

@@ -92,14 +92,7 @@ public virtual AObject Parent
 				if (_parent != value)
 				{
 					_parent = value;
-					if (_parent != null)
-					{
-						_parentGuid = _parent.Guid;
-					}
-					else
-					{
-						_parentGuid = Guid.Empty;
-					}
+					_parentGuid = _parent != null ? _parent.Guid : Guid.Empty;
 				}
 			}
 		}
@@ -172,7 +165,6 @@ public virtual bool Enabled
 		public DateTime EnabledTime
 		{
 			get { return _enabledTime; }
-			private set { throw new NotSupportedException("You can not set this Property."); }
 		}
 
 		#endregion

Core/AObjects.cs

@@ -67,14 +67,7 @@ protected void FireRemoved(AObjects aObjects, AObject aObject)
 
 		protected object ObjectLock
 		{
-			get
-			{
-				if (_objectLock == null)
-				{
-					_objectLock = new object();
-				}
-				return _objectLock;
-			}
+			get { return _objectLock ?? (_objectLock = new object()); }
 		}
 
 		readonly List<AObject> _children;
@@ -105,10 +98,9 @@ protected bool Add(AObject aObject)
 							aObject.EnabledChanged += FireEnabledChanged;
 							aObject.Changed += FireChanged;
 
-							if (aObject is AObjects)
+							var aObjects = aObject as AObjects;
+							if (aObjects != null)
 							{
-								AObjects aObjects = (AObjects) aObject;
-
 								aObjects.Added += FireAdded;
 								aObjects.Removed += FireRemoved;
 							}
@@ -137,10 +129,9 @@ protected bool Remove(AObject aObject)
 						aObject.EnabledChanged -= FireEnabledChanged;
 						aObject.Changed -= FireChanged;
 
-						if (aObject is AObjects)
+						var aObjects = aObject as AObjects;
+						if (aObjects != null)
 						{
-							AObjects aObjects = (AObjects) aObject;
-
 							aObjects.Added -= FireAdded;
 							aObjects.Removed -= FireRemoved;
 						}
@@ -161,10 +152,9 @@ public void AttachChildEvents()
 				tObject.EnabledChanged += FireEnabledChanged;
 				tObject.Changed += FireChanged;
 
-				if (tObject is AObjects)
+				var tObjects = tObject as AObjects;
+				if (tObjects != null)
 				{
-					AObjects tObjects = (AObjects) tObject;
-
 					tObjects.Added += FireAdded;
 					tObjects.Removed += FireRemoved;
 
@@ -192,10 +182,9 @@ public virtual AObject WithGuid(Guid aGuid)
 					tObjectReturn = tObject;
 					break;
 				}
-				else if (tObject is AObjects)
+				var tObjects = tObject as AObjects;
+				if (tObjects != null)
 				{
-					AObjects tObjects = (AObjects) tObject;
-
 					tObjectReturn = tObjects.WithGuid(aGuid);
 					if (tObjectReturn != null)
 					{
@@ -208,13 +197,14 @@ public virtual AObject WithGuid(Guid aGuid)
 
 		public virtual AObject Named(string aName)
 		{
-			AObject tObject = null;
 			try
 			{
-				tObject = All.First(obj => obj.Name.Trim().ToLower() == aName.Trim().ToLower());
+				return All.First(obj => obj.Name.Trim().ToLower() == aName.Trim().ToLower());
+			}
+			catch (Exception)
+			{
+				return null;
 			}
-			catch {}
-			return tObject;
 		}
 
 		public AObject Next(AObject aObject)

Core/Bot.cs

@@ -85,7 +85,7 @@ public States State
 		[NonSerialized]
 		IPAddress _ip = IPAddress.None;
 
-		public IPAddress IP
+		public IPAddress Ip
 		{
 			get { return _ip; }
 			set { SetProperty(ref _ip, value); }
@@ -208,7 +208,7 @@ public double Speed
 
 		public IEnumerable<Packet> Packets
 		{
-			get { return base.All.Cast<Packet>(); }
+			get { return All.Cast<Packet>(); }
 		}
 
 		public Packet Packet(int aId)
@@ -217,18 +217,20 @@ public Packet Packet(int aId)
 			{
 				return Packets.First(pack => pack.Id == aId);
 			}
-			catch {}
-			return null;
+			catch (Exception)
+			{
+				return null;
+			}
 		}
 
 		public void AddPacket(Packet aPacket)
 		{
-			base.Add(aPacket);
+			Add(aPacket);
 		}
 
 		public void RemovePacket(Packet aPacket)
 		{
-			base.Remove(aPacket);
+			Remove(aPacket);
 		}
 
 		public Packet OldestActivePacket()

Core/Channel.cs

@@ -45,7 +45,7 @@ public override bool Connected
 				{
 					foreach (AObject obj in All)
 					{
-						obj.Connected = value;
+						obj.Connected = false;
 					}
 				}
 				base.Connected = value;
@@ -74,22 +74,22 @@ public int ErrorCode
 
 		public IEnumerable<Bot> Bots
 		{
-			get { return base.All.Cast<Bot>(); }
+			get { return All.Cast<Bot>(); }
 		}
 
 		public Bot Bot(string aName)
 		{
-			return (Bot) base.Named(aName);
+			return base.Named(aName) as Bot;
 		}
 
 		public void AddBot(Bot aBot)
 		{
-			base.Add(aBot);
+			Add(aBot);
 		}
 
 		public void RemoveBot(Bot aBot)
 		{
-			base.Remove(aBot);
+			Remove(aBot);
 		}
 
 		#endregion

Core/Extensions.cs

@@ -30,7 +30,7 @@ public static class Extensions
 	{
 		public static string ToAscii(this string aString)
 		{
-			StringBuilder output = new StringBuilder(string.Empty);
+			var output = new StringBuilder(string.Empty);
 			if (!string.IsNullOrEmpty(aString))
 			{
 				for (int i = 0; i < aString.Length; i++)
@@ -43,16 +43,15 @@ public static string ToAscii(this string aString)
 
 		public static Int64 ToTimestamp(this DateTime aDate)
 		{
-			DateTime date = new DateTime(1970, 1, 1);
-			TimeSpan ts = new TimeSpan(aDate.Ticks - date.Ticks);
+			var date = new DateTime(1970, 1, 1);
+			var ts = new TimeSpan(aDate.Ticks - date.Ticks);
 			return (Convert.ToInt64(ts.TotalSeconds));
 		}
 
 		public static DateTime ToDate(this Int64 aTimestamp)
 		{
-			DateTime date = new DateTime(1970, 1, 1);
-			date.AddSeconds(aTimestamp);
-			return date;
+			var date = new DateTime(1970, 1, 1);
+			return date.AddSeconds(aTimestamp);
 		}
 
 		public static bool IsEqualWith(this byte[] aBytes1, byte[] aBytes2)

Core/File.cs

@@ -72,7 +72,7 @@ public Int64 Size
 		[DataMember]
 		public List<FilePart> Parts
 		{
-			get { return base.All.Cast<FilePart>().ToList(); }
+			get { return All.Cast<FilePart>().ToList(); }
 			private set { throw new NotSupportedException("You can not set this Property."); }
 		}
 

Core/Files.cs

@@ -41,8 +41,10 @@ public File File(string tmpPath)
 			{
 				return All.First(file => file.TmpPath == tmpPath);
 			}
-			catch {}
-			return null;
+			catch (Exception)
+			{
+				return null;
+			}
 		}
 
 		public void Add(File aFile)
@@ -52,7 +54,7 @@ public void Add(File aFile)
 
 		public void Add(string aName, Int64 aSize)
 		{
-			File tFile = new File(aName, aSize);
+			var tFile = new File(aName, aSize);
 			if (File(tFile.TmpPath) == null)
 			{
 				Add(tFile);

Core/Helper.cs

@@ -149,10 +149,7 @@ public static string ShrinkFileName(string aName, Int64 aSize)
 			{
 				return Regex.Replace(aName, "(\\(|\\)|\\[|\\]|\\{|\\}|-|_|\\.)", "").ToLower() + "." + aSize + "/";
 			}
-			else
-			{
-				return "";
-			}
+			return "";
 		}
 	}
 }

Core/Server.cs

@@ -44,7 +44,7 @@ public override bool Connected
 				{
 					foreach (AObject obj in All)
 					{
-						obj.Connected = value;
+						obj.Connected = false;
 					}
 				}
 				base.Connected = value;
@@ -83,7 +83,7 @@ public SocketErrorCode ErrorCode
 
 		public IEnumerable<Channel> Channels
 		{
-			get { return base.All.Cast<Channel>(); }
+			get { return All.Cast<Channel>(); }
 		}
 
 		public Channel Channel(string aName)
@@ -111,7 +111,7 @@ public Bot Bot(string aName)
 
 		public void AddChannel(Channel aChannel)
 		{
-			base.Add(aChannel);
+			Add(aChannel);
 		}
 
 		public void AddChannel(string aChannel)
@@ -123,16 +123,14 @@ public void AddChannel(string aChannel)
 			}
 			if (Channel(aChannel) == null)
 			{
-				Channel tChannel = new Channel();
-				tChannel.Name = aChannel;
-				tChannel.Enabled = Enabled;
+				var tChannel = new Channel {Name = aChannel, Enabled = Enabled};
 				AddChannel(tChannel);
 			}
 		}
 
 		public void RemoveChannel(Channel aChannel)
 		{
-			base.Remove(aChannel);
+			Remove(aChannel);
 		}
 
 		#endregion

Core/Servers.cs

@@ -50,10 +50,7 @@ public void Add(string aServer)
 			aServer = aServer.Trim().ToLower();
 			if (Server(aServer) == null)
 			{
-				Server tServer = new Server();
-				tServer.Name = aServer;
-				tServer.Port = 6667;
-				tServer.Enabled = true;
+				var tServer = new Server {Name = aServer, Port = 6667, Enabled = true};
 				Add(tServer);
 			}
 		}