Cleanup - FxCop

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs

@@ -101,7 +101,7 @@ namespace ICSharpCode.Reports.Core {
 		}
 		
 		
-		string ExtractValue(BaseComparer element)
+		static string ExtractValue(BaseComparer element)
 		{
 			string val = String.Empty;
 			GroupColumn gc = element.ColumnCollection[0] as GroupColumn;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs

@@ -95,8 +95,7 @@ namespace ICSharpCode.Reports.Core
 		
 		object ExtractDBValue(DataRow row,BaseDataItem item)
 		{
-			string expression = String.Empty;
-			if  ((!String.IsNullOrEmpty(item.Expression)) && (item.Expression.StartsWith("="))) {
+			if  ((!String.IsNullOrEmpty(item.Expression)) && (item.Expression.StartsWith("=",StringComparison.InvariantCultureIgnoreCase))) {
 				return ExtractFromExpression(item.Expression, row);
 			}
 			else
@@ -163,6 +162,17 @@ namespace ICSharpCode.Reports.Core
 		}
 		
 		
+		private IndexList IndexBuilder(SortColumnCollection col)
+		{
+			IndexList arrayList = new IndexList();
+			for (int rowIndex = 0; rowIndex < this.table.Rows.Count; rowIndex++){
+				object[] values = new object[1];
+				arrayList.Add(new SortComparer(col, rowIndex, values));
+			}
+			return arrayList;
+		}
+		
+		
 		public override void Group ()
 		{
 			base.Group();
@@ -211,7 +221,7 @@ namespace ICSharpCode.Reports.Core
 		
 		
 		
-		object ExtractColumnValue(DataRow row,ColumnCollection col, int criteriaIndex)
+		 object  ExtractColumnValue(DataRow row,ColumnCollection col, int criteriaIndex)
 		{
 			AbstractColumn c = (AbstractColumn)col[criteriaIndex];
 			object val = null;
@@ -224,9 +234,9 @@ namespace ICSharpCode.Reports.Core
 		}
 		
 		
-		string CleanupColumnName(string colName)
+		static string  CleanupColumnName(string colName)
 		{
-			if (colName.StartsWith("=[")) {
+			if (colName.StartsWith("=[",StringComparison.InvariantCulture)) {
 				return colName.Substring(2, colName.Length - 3);
 			}
 			return colName;
@@ -235,7 +245,7 @@ namespace ICSharpCode.Reports.Core
 		
 		object DBValueFromRow(DataRow row, string colName)
 		{
-			int pos  =  colName.IndexOf("!");
+			int pos  =  colName.IndexOf("!",StringComparison.InvariantCultureIgnoreCase);
 			if (pos > 0)
 			{
 				return ExtractFromExpression(colName,row);
@@ -253,18 +263,7 @@ namespace ICSharpCode.Reports.Core
 			return v;
 		}
 		
-		
-		private IndexList IndexBuilder(SortColumnCollection col)
-		{
-			IndexList arrayList = new IndexList();
-			for (int rowIndex = 0; rowIndex < this.table.Rows.Count; rowIndex++){
-				object[] values = new object[1];
-				arrayList.Add(new SortComparer(col, rowIndex, values));
-			}
-			return arrayList;
-		}
-		
-		
+
 		public override object CurrentFromPosition (int pos)
 		{
 			return this.table.Rows[pos];

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs

@@ -226,7 +226,7 @@ foreach (var element in section.Items)
 		}
 		*/
 		
-		int CalculateGap(BaseReportItem oldItem, BaseReportItem item)
+		static int CalculateGap(BaseReportItem oldItem, BaseReportItem item)
 		{
 				var gap = item.Location.Y - (oldItem.Location.Y + oldItem.Size.Height) ;
 						if (gap < 0) {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs

@@ -64,8 +64,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		protected override void BuildReportHeader ()
 		{
-			if ((base.Pages.Count == 0) && (base.ReportModel.ReportHeader.Items.Count > 0)) {
-				var s = base.ReportModel.ReportHeader;
+			if ((base.Pages.Count == 0) && (base.ReportModel.ReportHeader.Items.Count > 0))
+			{
 				base.ReportModel.ReportHeader.SectionOffset = base.SinglePage.SectionBounds.ReportHeaderRectangle.Top;
 				ExporterCollection convertedList =  base.ConvertSection (base.ReportModel.ReportHeader,this.dataNavigator.CurrentRow);
 				base.SectionBounds.MeasurePageHeader(base.ReportModel.ReportHeader);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportHelper.cs

@@ -60,7 +60,7 @@ namespace ICSharpCode.Reports.Core.Project.Exporter
 			return col;
 		}
 		
-		
+		/*
 		public static Point   ConvertPlainCollection_2 (ExportContainer container,ReportItemCollection items,Point offset)
 		{
 			if (items == null) {
@@ -90,6 +90,8 @@ namespace ICSharpCode.Reports.Core.Project.Exporter
 			return offset;
 		}
 		
+		*/
+		
 		
 		public static ExportContainer ConvertToContainer (ISimpleContainer container,Point offset) 
 		{

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/EvaluationHelper.cs

@@ -44,39 +44,39 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 		
 		public static void EvaluateReportItems (IExpressionEvaluatorFacade  evaluator,ReportItemCollection items)
 		{
-			try {
-				foreach(BaseReportItem column in items) {
-					var container = column as ISimpleContainer ;
-					if (container != null) {
-						EvaluateReportItems(evaluator,container.Items);
-					}
-					BaseTextItem textItem = column as BaseTextItem;
-					if (textItem != null) {
-						textItem.Text = evaluator.Evaluate(textItem.Text);
-					}
+			foreach(BaseReportItem column in items) {
+				var container = column as ISimpleContainer ;
+				if (container != null) {
+					EvaluateReportItems(evaluator,container.Items);
+				}
+				BaseTextItem textItem = column as BaseTextItem;
+				if (textItem != null) {
+					textItem.Text = evaluator.Evaluate(textItem.Text);
 				}
-			} catch (Exception) {
-				throw ;
 			}
 		}
 		
 		public static void EvaluateRow(IExpressionEvaluatorFacade evaluator,ExporterCollection row)
 		{
-			try {
-				foreach (BaseExportColumn column in row) {
-					var container = column as IExportContainer;
-					if (container != null) {
-						EvaluateRow(evaluator,container.Items);
-					}
-					ExportText textItem = column as ExportText;
-					if (textItem != null) {
-						textItem.Text = evaluator.Evaluate(textItem.Text);
-					}
+			foreach (BaseExportColumn column in row) {
+				var container = column as IExportContainer;
+				if (container != null) {
+					EvaluateRow(evaluator,container.Items);
+				}
+				ExportText textItem = column as ExportText;
+				if (textItem != null) {
+					textItem.Text = evaluator.Evaluate(textItem.Text);
 				}
-			} catch (Exception) {
-				throw ;
 			}
 		}
 		
+		
+		public static bool CanEvaluate (string expressionn)
+		{
+			if ((!String.IsNullOrEmpty(expressionn)) && (expressionn.StartsWith("=",StringComparison.InvariantCultureIgnoreCase))) {
+				return true;
+			}
+			return false;
+		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs

@@ -19,7 +19,7 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 		private ReportingLanguageCompiler compiler;
 		private ExpressionContext context;
 		private IPageInfo singlePage;
-		 
+		
 		
 		public ExpressionEvaluatorFacade(IPageInfo pageInfo)
 		{
@@ -35,7 +35,7 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 		public string Evaluate (string expression)
 		{
 			try {
-				if (CanEvaluate(expression)) {
+				if (EvaluationHelper.CanEvaluate(expression)) {
 					IExpression compiled = compiler.CompileExpression<string>(expression);
 					
 					this.context.ContextObject = this.SinglePage;
@@ -45,19 +45,24 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 				}
 			} catch (Exception e) {
 				expression = e.Message;
-				Console.WriteLine("");
-				Console.WriteLine("ExpressionEvaluatorFacade.Evaluate");
-				Console.WriteLine(e.Message);
-				Console.WriteLine("");
+				WriteLogMessage(e);
 			}
 			
 			return expression;
 		}
+
+		static void WriteLogMessage(Exception e)
+		{
+			Console.WriteLine("");
+			Console.WriteLine("ExpressionEvaluatorFacade.Evaluate");
+			Console.WriteLine(e.Message);
+			Console.WriteLine("");
+		}
 		
 		public string Evaluate (string expression, object row)
 		{
 			try {
-				if (CanEvaluate(expression)) {
+				if (EvaluationHelper.CanEvaluate(expression)) {
 					IExpression compiled = compiler.CompileExpression<string>(expression);
 					
 					this.context.ContextObject =row;
@@ -67,23 +72,12 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 				}
 			} catch (Exception e) {
 				expression = e.Message;
-				Console.WriteLine("");
-				Console.WriteLine("ExpressionEvaluatorFacade.Evaluate");
-				Console.WriteLine(e.Message);
-				Console.WriteLine("");
+				WriteLogMessage(e);
 			}
 			
 			return expression;
 		}
 		
-		private static bool CanEvaluate (string expressionn)
-		{
-			if ((!String.IsNullOrEmpty(expressionn)) && (expressionn.StartsWith("="))) {
-				return true;
-			}
-			return false;
-		}
-		
 		
 		private void FunctionStore (object sender,SimpleExpressionEvaluator.Evaluation.UnknownFunctionEventArgs e)
 		{

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Utilities/PropertyPath.cs

@@ -23,7 +23,7 @@ namespace SimpleExpressionEvaluator.Utilities
             if (target == null && _rootIsStatic == false)
                 return null;
             
-            Type s = target.GetType();
+//            Type s = target.GetType();
            
             if (target != null && _rootType.IsAssignableFrom(target.GetType()) == false)
                 return null;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/GlobalLists.cs

@@ -14,7 +14,7 @@ namespace ICSharpCode.Reports.Core.Globals
 	/// <summary>
 	/// Description of GlobalLists.
 	/// </summary>
-	public class GlobalLists
+	public static class GlobalLists
 	{
 		
 		public enum FunctionTypes {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs

@@ -205,7 +205,6 @@ namespace ICSharpCode.Reports.Core
 	
 		protected virtual Point RenderSection (ReportPageEventArgs rpea)
 		{
-			Point currentPosition	= Point.Empty;
 			
 			this.CurrentSection.Render (rpea);
 			

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RendererFactory.cs

@@ -15,7 +15,7 @@ namespace ICSharpCode.Reports.Core
 	/// <summary>
 	/// Description of RendererFactory.
 	/// </summary>
-	public class PrintRendererFactory
+	public static class PrintRendererFactory
 	{
 		  
 		public static IBaseRenderer  CreateRenderer (BaseReportItem itemToConvert,IDataNavigator dataNavigator,