Cleanup - FxCop

Author: PeterForstmeier

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerBinding.cs

@@ -47,9 +47,7 @@ public IViewContent CreateContentForFile(OpenedFile file)
 			if (file.IsDirty) {
 
 				var reportModel = ReportModelFactory.Create();
-	
-				var reportFactory = new CreateFormSheetFromModel();
-				var xml = reportFactory.ToXml(reportModel);
+				var xml = CreateFormSheetFromModel.ToXml(reportModel);
 
 				var doc = new XmlDocument();
 				doc.LoadXml(xml.ToString());

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Factory/CreateFormSheetFromModel.cs

@@ -19,10 +19,10 @@ namespace ICSharpCode.Reporting.Addin.Factory
 	/// <summary>
 	/// Description of CreateFormSheetReport.
 	/// </summary>
-	class CreateFormSheetFromModel
+	static class CreateFormSheetFromModel
 	{
 
-		public StringWriter ToXml(IReportModel reportModel) {
+		public static StringWriter ToXml(IReportModel reportModel) {
 			int locY = reportModel.ReportSettings.TopMargin;
 
 				foreach (var section in reportModel.SectionCollection)

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

@@ -22,6 +22,7 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Xml;
+using System.Xml.XPath;
 using ICSharpCode.Reporting.Xml;
 
 
@@ -102,8 +103,7 @@ protected void ProcessChildProperties(XmlNode node, object parent)
 			Type t=parent.GetType();
 
 			// children of a class must always be properties
-			foreach(XmlNode child in node.ChildNodes)
-			{
+			foreach(XmlNode child in node.ChildNodes){
 				if (child is XmlElement)
 				{
 					string pname=child.LocalName;
@@ -220,7 +220,7 @@ protected void ProcessAttributes(XmlNode node, object ret, Type type)
 			}
 		}
 
-		void SetPropertyToString(object obj, PropertyInfo pi, string value)
+		static void SetPropertyToString(object obj, PropertyInfo pi, string value)
 		{
 			// it's string, so use a type converter.
 			TypeConverter tc=TypeDescriptor.GetConverter(pi.PropertyType);

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj

@@ -91,13 +91,8 @@
     <Compile Include="Src\BaseClasses\TextDrawer.cs" />
     <Compile Include="Src\Collections.cs" />
     <Compile Include="Src\Configuration\AssemblyInfo.cs" />
+    <Compile Include="Src\DataManager\DataCollection.cs" />
     <Compile Include="Src\DataManager\Listhandling\CollectionDataSource.cs" />
-    <Compile Include="Src\DataManager\Listhandling\IndexList.cs" />
-    <Compile Include="Src\DataSource\Comparer\BaseComparer.cs" />
-    <Compile Include="Src\DataSource\Comparer\GroupComparer.cs" />
-    <Compile Include="Src\DataSource\Comparer\SortComparer.cs" />
-    <Compile Include="Src\DataSource\Comparer\SortExtension.cs" />
-    <Compile Include="Src\DataSource\DataCollection.cs" />
     <Compile Include="Src\DataSource\ExtendedPropertyDescriptor.cs" />
     <Compile Include="Src\DataSource\ExtendedTypeDescriptor.cs" />
     <Compile Include="Src\DataSource\FieldMemberAccessor.cs" />
@@ -196,7 +191,6 @@
     <Compile Include="Src\Xml\MycroParser.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Src\DataSource\Comparer" />
     <Folder Include="Src\Exporter\Visitors" />
     <Folder Include="Src\Expressions\Irony" />
     <Folder Include="Src\Expressions\Irony\Ast" />

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Collections.cs

@@ -52,9 +52,6 @@ public void AddRange (IEnumerable<SortColumn> items)
 
 	public class GroupColumnCollection: SortColumnCollection
 	{
-		public GroupColumnCollection()
-		{
-		}
 
 		public new AbstractColumn Find (string columnName)
 		{
@@ -67,12 +64,7 @@ public GroupColumnCollection()
 	}
 
 
-	public class ParameterCollection: Collection<BasicParameter>{
-		
-		public ParameterCollection()
-		{			
-		}
-		
+	public class ParameterCollection: Collection<BasicParameter>{		
 
 		public BasicParameter Find (string parameterName)
 		{
@@ -85,7 +77,7 @@ public BasicParameter Find (string parameterName)
 
 		public static CultureInfo Culture
 		{
-			get { return System.Globalization.CultureInfo.CurrentCulture; }
+			get { return CultureInfo.CurrentCulture; }
 		}
 
 

…porting/Src/DataSource/DataCollection.cs …orting/Src/DataManager/DataCollection.cssrc/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/DataCollection.cs renamed to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/DataCollection.cs src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/DataCollection.cs renamed to src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/DataCollection.cs

@@ -24,8 +24,9 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using ICSharpCode.Reporting.DataSource;
 
-namespace ICSharpCode.Reporting.DataSource
+namespace ICSharpCode.Reporting.DataManager
 {
 	/// <summary>
 	/// Description of DataCollection.

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/Listhandling/CollectionDataSource.cs

@@ -44,7 +44,6 @@ public class CollectionDataSource:IDataSource
 	{
 		readonly DataCollection<object> baseList;
 		readonly ReportSettings reportSettings;
-//		readonly Type elementType;
 		readonly PropertyDescriptorCollection listProperties;
 
 
@@ -61,24 +60,7 @@ public CollectionDataSource(IEnumerable list, ReportSettings reportSettings)
 			this.listProperties = this.baseList.GetItemProperties(null);
 			OrderGroup = OrderGroup.AsIs;
 		}
-		
-		
-		[Obsolete("use public CollectionDataSource(IEnumerable list, ReportSettings reportSettings")]
-		public CollectionDataSource(IEnumerable list, Type elementType, ReportSettings reportSettings)
-		{
-			if (list == null)
-				throw new ArgumentNullException("list");
-			if (reportSettings == null)
-				throw new ArgumentNullException("reportSettings");
-			
-			baseList = CreateBaseList(list);
-			CurrentList = baseList;
-			this.reportSettings = reportSettings;
-			this.listProperties = this.baseList.GetItemProperties(null);
-			OrderGroup = OrderGroup.AsIs;
-		}
-		
-		
+	
 
 		public Collection<AbstractColumn> AvailableFields {
 			get {
@@ -176,7 +158,7 @@ public void Bind()
 
 		public void Fill (List<IPrintableObject> collection, object current) {
 			Current = current;
-						foreach (var element in collection) {
+			foreach (var element in collection) {
 				var container = element as ReportContainer;
 				if (container != null) {
 					FillFromList(container.Items);