Cleanup - FxCop

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/ReportRootDesigner.cs

@@ -24,6 +24,7 @@ using System.ComponentModel.Design;
 using System.Drawing;
 using System.Drawing.Design;
 using System.Drawing.Printing;
+using System.Globalization;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
 using ICSharpCode.Core;
@@ -217,7 +218,6 @@ namespace ICSharpCode.Reporting.Addin.Designer
 			if (section != null) {
 				sections.Add(section);
 				section.SizeChanged += new EventHandler( OnSectionSizeChanged);
-				Console.Write("reportRootDesigner:OnComponentAdded");
 				foreach (Control ctrl in section.Controls) {
 					AddToHost(ctrl);
 					host.Container.Add(ctrl);
@@ -240,7 +240,7 @@ namespace ICSharpCode.Reporting.Addin.Designer
 		private void OnComponentChanged(object sender, ComponentChangedEventArgs ce)
 		{
 			LoggingService.InfoFormatted("RootDesigner:OnComponentChanged");
-			String str = String.Format("RootDesigner:OnComponentChanged <{0}> from <{1}> to <{2}>",ce.Component.ToString(),ce.OldValue,ce.NewValue);
+			var str = String.Format(CultureInfo.CurrentCulture,"RootDesigner:OnComponentChanged <{0}> from <{1}> to <{2}>",ce.Component.ToString(),ce.OldValue,ce.NewValue);
 			LoggingService.InfoFormatted(str);
 
 			var section = ce.Component as BaseSection;

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Globals/StringWriterWithEncoding.cs

@@ -16,7 +16,7 @@ namespace ICSharpCode.Reporting.Addin.Globals
 	/// </summary>
 	class StringWriterWithEncoding:System.IO.StringWriter
 	{
-		private readonly Encoding encoding;
+		readonly Encoding encoding;
 		
 		public StringWriterWithEncoding(Encoding encoding)
 		{

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/AbstractItemTypeProvider.cs

@@ -22,26 +22,20 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		{
 		}
 		
-//		public AbstractItemTypeProvider(TypeDescriptionProvider parent): base(parent)
-//		{
-//		}
-
 		
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType, instance);
-			return new AbstractItemTypeDescriptor(td, instance);
+			return new AbstractItemTypeDescriptor(td);
 		}
 	}
 	
-	internal class AbstractItemTypeDescriptor : CustomTypeDescriptor
+	class AbstractItemTypeDescriptor : CustomTypeDescriptor
 	{
-//		private AbstractItem _instance;
 		
-		public AbstractItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public AbstractItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
-//			_instance = instance as AbstractItem;
 		}
 
 		
@@ -54,8 +48,8 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 
 			foreach (PropertyDescriptor p in props)
 			{

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/CircleItemTypeProvider.cs

@@ -26,7 +26,7 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new CircleItemTypeDescriptor(td, instance);
+			return new CircleItemTypeDescriptor(td);
 		}
 	}
 	
@@ -34,7 +34,7 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 	class CircleItemTypeDescriptor : CustomTypeDescriptor
 	{
 	
-		public CircleItemTypeDescriptor(ICustomTypeDescriptor parent, object instance): base(parent)
+		public CircleItemTypeDescriptor(ICustomTypeDescriptor parent): base(parent)
 		{
 		}
 
@@ -48,7 +48,7 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
 			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var allProperties = new List<PropertyDescriptor>();
 			
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			TypeProviderHelper.AddGraphicProperties(allProperties,props);

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/DataItemTypeProvider.cs

@@ -27,7 +27,7 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new DataItemTypeDescriptor(td, instance);
+			return new DataItemTypeDescriptor(td);
 		}
 	}
 	
@@ -36,7 +36,7 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 	class DataItemTypeDescriptor : CustomTypeDescriptor
 	{
 		
-		public DataItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public DataItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 		}
@@ -50,8 +50,8 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 		
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			TypeProviderHelper.AddTextBasedProperties(allProperties,props);

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/GroupedRowTypeProvider.cs

@@ -26,14 +26,14 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new GroupedRowItemTypeDescriptor(td, instance);
+			return new GroupedRowItemTypeDescriptor(td);
 		}
 	}
 	
 	
 	class GroupedRowItemTypeDescriptor : CustomTypeDescriptor
 	{
-		public GroupedRowItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public GroupedRowItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 		}
@@ -47,8 +47,8 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			
@@ -69,16 +69,9 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 			prop = props.Find("Controls",true);
 			allProperties.Add(prop);
 		
-//			prop = props.Find("AlternateBackColor",true);
-//			allProperties.Add(prop);
-//			
-//			prop = props.Find("ChangeBackColorEveryNRow",true);
-//			allProperties.Add(prop);
-			
 			prop = props.Find("PageBreakOnGroupChange",true);
 			allProperties.Add(prop);
 			
-			
 			return new PropertyDescriptorCollection(allProperties.ToArray());
 		}
 	}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/LineItemTypeProvider.cs

@@ -25,7 +25,7 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new LineItemTypeDescriptor(td, instance);
+			return new LineItemTypeDescriptor(td);
 		}
 	}
 	
@@ -35,7 +35,7 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 	{
 
 		
-		public LineItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public LineItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 
@@ -50,8 +50,8 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 			
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			
@@ -71,9 +71,6 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 			prop = props.Find("EndLineCap",true);
 			allProperties.Add(prop);
 			
-//			prop = props.Find("DashLineCap",true);
-//			allProperties.Add(prop);
-			
 			prop = props.Find("DashStyle",true);
 			allProperties.Add(prop);
 			

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/RectangleItemTypeProvider.cs

@@ -25,7 +25,7 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new RectangleItemTypeDescriptor(td, instance);
+			return new RectangleItemTypeDescriptor(td);
 		}
 	}
 	
@@ -33,7 +33,7 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 	class RectangleItemTypeDescriptor : CustomTypeDescriptor
 	{
 	
-		public RectangleItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public RectangleItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 		}
@@ -47,8 +47,8 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 			
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			TypeProviderHelper.AddGraphicProperties(allProperties,props);

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/RowItemTypeProvider.cs

@@ -26,14 +26,14 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new RowItemTypeDescriptor(td, instance);
+			return new RowItemTypeDescriptor(td);
 		}
 	}
 	
 	
 	internal class RowItemTypeDescriptor : CustomTypeDescriptor
 	{
-		public RowItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public RowItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 		}
@@ -47,8 +47,8 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			
@@ -69,12 +69,6 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 			prop = props.Find("Controls",true);
 			allProperties.Add(prop);
 	
-//			prop = props.Find("AlternateBackColor",true);
-//			allProperties.Add(prop);
-//			
-//			prop = props.Find("ChangeBackColorEveryNRow",true);
-//			allProperties.Add(prop);
-			
 			return new PropertyDescriptorCollection(allProperties.ToArray());
 		}
 	}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/SectionItemTypeProvider.cs

@@ -26,7 +26,7 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new SectionItemDescriptor(td, instance);
+			return new SectionItemDescriptor(td);
 		}
 	}
 	
@@ -35,7 +35,7 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 	{
 
 		
-		public SectionItemDescriptor(ICustomTypeDescriptor parent, object instance)
+		public SectionItemDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 		}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/TextItemTypeProvider.cs

@@ -26,19 +26,17 @@ namespace ICSharpCode.Reporting.Addin.TypeProvider
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new TextItemTypeDescriptor(td, instance);
+			return new TextItemTypeDescriptor(td);
 		}
 	}
 	
 	
 	class TextItemTypeDescriptor : CustomTypeDescriptor
 	{
-//		BaseTextItem instance;
 		
-		public TextItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public TextItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
-//			instance = instance as BaseTextItem;
 		}
 
 		

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Views/DesignerView.cs

@@ -212,7 +212,7 @@ namespace ICSharpCode.Reporting.Addin.Views
 					abstractItem.Site.Name = abstractItem.Name;
 				}
 			}
-			UpdatePropertyPadSelection((ISelectionService)sender);
+			UpdatePropertyPadSelection(selectionService);
 		}
 		
 		#endregion

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/MycroWriter.cs

@@ -9,6 +9,7 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
 using System.Reflection;
 using System.Xml;
 using System.Xml.Serialization;
@@ -53,7 +54,7 @@ namespace ICSharpCode.Reporting.Addin.XML
 				if (val is ICollection) {
 //					PropertyInfo pinfo = t.GetProperty(info.Name);
 //					Console.WriteLine("pinfo {0}",pinfo.Name);
-					if (info.Name.StartsWith("Contr")) {
+					if (info.Name.StartsWith("Contr",true,CultureInfo.CurrentCulture)) {
 						writer.WriteStartElement("Items");
 					} else {
 					writer.WriteStartElement(info.Name);

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/ReportDefinitionParser.cs

@@ -20,6 +20,7 @@ using System;
 using System.Collections;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Globalization;
 using System.Reflection;
 using System.Xml;
 using System.Xml.XPath;
@@ -118,7 +119,7 @@ namespace ICSharpCode.Reporting.Addin.XML
 						// Special case--we're going to assume that the child is a class instance
 						// not associated with the parent object
 //						Trace.Fail("Unsupported property: "+pname);
-						System.Console.WriteLine("Unsupported property: "+pname);
+						Console.WriteLine("Unsupported property: "+pname);
 						continue;
 					}
 
@@ -134,8 +135,8 @@ namespace ICSharpCode.Reporting.Addin.XML
 						{
 							object propObject=pi.GetValue(parent, null);
 							object obj=ProcessNode(grandChild, propObject);
-							System.Windows.Forms.Control parentControl = parent as System.Windows.Forms.Control;
-							System.Windows.Forms.Control childControl = obj as System.Windows.Forms.Control;
+							var parentControl = parent as System.Windows.Forms.Control;
+							var childControl = obj as System.Windows.Forms.Control;
 							// we have the Items Section
 							if ((parentControl != null) && (childControl != null)){
 								parentControl.Controls.Add(childControl);
@@ -228,8 +229,7 @@ namespace ICSharpCode.Reporting.Addin.XML
 			{
 				if (tc.CanConvertFrom(typeof(string)))
 				{
-					object val=tc.ConvertFromInvariantString(value);
-//			Console.WriteLine("\tRDP -> SetPropertyToString {0} - {1}",pi.Name,value.ToString());		
+					object val=tc.ConvertFromInvariantString(value);	
 					pi.SetValue(obj, val, null);
 				} else if (pi.PropertyType == typeof(Type)) {
 					pi.SetValue(obj, Type.GetType(value), null);
@@ -237,9 +237,9 @@ namespace ICSharpCode.Reporting.Addin.XML
 			}
 			catch(Exception e)
 			{
-				String s = String.Format("Property setter for {0} failed {1}\r\n",pi.Name,
+				var s = String.Format(CultureInfo.CurrentCulture,"Property setter for {0} failed {1}\r\n",pi.Name,
 				                         e.Message);
-				System.Console.WriteLine("MycroParser : {0}",s);
+				Console.WriteLine("MycroParser : {0}",s);
 			}
 		}
 	}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/ReportDesignerWriter.cs

@@ -7,6 +7,7 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
+using System.Globalization;
 
 namespace ICSharpCode.Reporting.Addin.XML
 {
@@ -15,13 +16,11 @@ namespace ICSharpCode.Reporting.Addin.XML
 	/// </summary>
 	class ReportDesignerWriter:MycroWriter
 	{
-		public ReportDesignerWriter() {
-			Console.WriteLine("ReportDesignerWriter");
-			Console.WriteLine();
-		}
 		protected override string GetTypeName(Type t)
 		{
-			if (t.BaseType != null && t.BaseType.Name.StartsWith("Base",StringComparison.InvariantCultureIgnoreCase)) {
+			if (t.BaseType != null && t.BaseType.Name.StartsWith("Base", StringComparison.OrdinalIgnoreCase)) {
+			                                                    
+			                                                    
 //				return t.BaseType.Name;
 			}
 			return t.Name;

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedTypeDescriptor.cs

@@ -28,7 +28,7 @@ namespace ICSharpCode.Reporting.DataSource
 	/// </summary>
 	class ExtendedTypeDescriptor
 	{
-		static Hashtable collections = new Hashtable();
+		static readonly Hashtable collections = new Hashtable();
 
 		static bool IsAllowedProperty(string name)
 		{

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs

@@ -21,6 +21,7 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Xml;
 using System.Reflection;
 
@@ -223,7 +224,7 @@ namespace ICSharpCode.Reporting.Xml
 	    static void SetPropertyToString(object obj, PropertyInfo pi, string value)
 		{
 			// it's string, so use a type converter.
-			TypeConverter tc=TypeDescriptor.GetConverter(pi.PropertyType);
+			var tc=TypeDescriptor.GetConverter(pi.PropertyType);
 			try
 			{
 				if (tc.CanConvertFrom(typeof(string)))
@@ -236,9 +237,9 @@ namespace ICSharpCode.Reporting.Xml
 			}
 			catch(Exception e)
 			{
-				String s = String.Format("Property setter for {0} failed {1}\r\n",pi.Name,
+				var s = String.Format(CultureInfo.CurrentCulture,"Property setter for {0} failed {1}\r\n",pi.Name,
 				                         e.Message);
-				System.Console.WriteLine("MycroParser : {0}",s);
+				Console.WriteLine("MycroParser : {0}",s);
 			}
 		}