Fixes from FxCop

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1676 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs

@@ -78,7 +78,7 @@ namespace SharpReport{
 					break;
 				case GlobalEnums.PushPullModelEnum.PushData:
 					//PushData
-					columnCollecion = base.CollectFieldsFromModel(this.baseDesignerControl.ReportModel);
+					columnCollecion = SharpReportEngine.CollectFieldsFromModel(this.baseDesignerControl.ReportModel);
 					break;
 				case GlobalEnums.PushPullModelEnum.PullData:
 					// PullData, query the Datasource and ask for the available Fields

src/AddIns/Misc/SharpReport/SharpReportCore/BaseClasses/DataTypeHelper.cs

@@ -18,7 +18,9 @@ namespace SharpReportCore
 		
 		//TODO why not use 
 		// TypeCode tc = Type.GetTypeCode( Type.GetType("System.String"));
+		private DataTypeHelper () {
 			
+		}
 		internal static TypeCode TypeCodeFromString (string type) {
 			TypeCode tc;
 			
@@ -66,7 +68,7 @@ namespace SharpReportCore
 			return tc;
 		}
 		
-		static internal bool IsNumber(TypeCode tc){
+		internal static  bool IsNumber(TypeCode tc){
 			
 			switch (tc){
 				case TypeCode.Int32:

src/AddIns/Misc/SharpReport/SharpReportCore/BaseClasses/SqlParameter.cs

@@ -29,7 +29,7 @@ namespace SharpReportCore {
 	
 		DbType	dataType;
 		object defaultValue;
-//		bool allowBlank;
+
 		ParameterDirection  parameterDirection = ParameterDirection.InputOutput;
 	
 		#region Constructor
@@ -182,15 +182,6 @@ namespace SharpReportCore {
 			}
 		}
 
-
-//		/// <summary>
-//		/// Is a Blank value allowed
-//		/// </summary>
-//		public bool AllowBlank {
-//			get {
-//				return allowBlank;
-//			}
-//		}
 		/// <summary>
 		/// When no value is entered, use this value
 		/// </summary>

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseGraphicItem.cs

@@ -32,11 +32,10 @@ namespace SharpReportCore {
 		}
 		
 		
-		protected  SizeF MeasureReportItem (SharpReportCore.ReportPageEventArgs rpea,IItemRenderer item) {
+		protected static SizeF MeasureReportItem (IItemRenderer item) {
 			if (item == null) {
-				throw new ArgumentNullException("item","BaseGraphicItem");
+				throw new ArgumentNullException("item");
 			}
-			
 			return new SizeF (item.Size.Width,item.Size.Height);
 		}
 		

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/BaseTextItem.cs

@@ -29,7 +29,7 @@ namespace SharpReportCore {
 		private StringFormat stringFormat;
 		private StringTrimming stringTrimming;
 		private TextDrawer textDrawer;
-		private StandardFormatter standartFormatter;
+//		private StandardFormatter standartFormatter;
 		private ContentAlignment contentAlignment;
 		private RectangleShape shape = new RectangleShape();
 		
@@ -40,7 +40,6 @@ namespace SharpReportCore {
 			this.contentAlignment = ContentAlignment.MiddleLeft;
 			this.stringTrimming = StringTrimming.EllipsisCharacter;
 			this.textDrawer = new TextDrawer();
-			this.standartFormatter = new StandardFormatter();
 		}
 		
 		#endregion
@@ -48,7 +47,7 @@ namespace SharpReportCore {
 		protected string FormatOutput(string valueToFormat,string format,
 		                              TypeCode typeCode, string nullValue ){
 			
-			return standartFormatter.FormatItem(valueToFormat,format,
+			return StandardFormatter.FormatItem(valueToFormat,format,
 			                                        typeCode,nullValue);			
 		}
 		
@@ -188,7 +187,7 @@ namespace SharpReportCore {
 		[XmlIgnoreAttribute]
 		public virtual StringFormat StringFormat {
 			get {
-				return this.textDrawer.BuildStringFormat (this.StringTrimming,
+				return TextDrawer.BuildStringFormat (this.StringTrimming,
 				                                          this.ContentAlignment);
 			}
 		}

src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/Graphics/BaseImageItem.cs

@@ -91,7 +91,7 @@ namespace SharpReportCore {
 				rpea.LocationAfterDraw = new Point (this.Location.X + this.Image.Width,
 				                                    this.Location.Y + this.Image.Height);
 			} else {
-				SizeF measureSize = base.MeasureReportItem (rpea,this);
+				SizeF measureSize = BaseGraphicItem.MeasureReportItem (this);
 				RectangleF rect =  base.DrawingRectangle (measureSize);
 				g.DrawImage(this.Image,
 				            rect);

src/AddIns/Misc/SharpReport/SharpReportCore/Collections/Collections.cs

@@ -120,6 +120,9 @@ namespace SharpReportCore{
 	public class ReportSectionCollection: List<BaseReportObject>{
 		
 		public BaseReportObject Find (string columnName) {
+			if (String.IsNullOrEmpty(columnName)) {
+				throw new ArgumentNullException("columnName");
+			}
 			for (int i = 0;i < this.Count ; i ++) {
 				BaseReportObject col = this[i];
 				if (String.Compare(col.Name.ToLower(CultureInfo.CurrentCulture),

src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/SqlQueryChecker.cs

@@ -16,7 +16,6 @@ namespace SharpReportCore{
 	/// This Class checks for invalid SqlStatements
 	/// </summary>
 	internal class SqlQueryChecker{
-		internal string noValidMessage = "Query should start with 'Select'";
 		
 		private SqlQueryChecker () {
 		}

src/AddIns/Misc/SharpReport/SharpReportCore/Printing/AbstractRenderer.cs

@@ -31,8 +31,6 @@ namespace SharpReportCore {
 		
 		private int sectionInUse;
 	
-	
-		private StandardFormatter standartFormatter;
 		private bool cancel;		
 		
 		public event EventHandler<SectionRenderEventArgs> Rendering;
@@ -47,7 +45,6 @@ namespace SharpReportCore {
 			this.reportSettings = model.ReportSettings;
 			this.sections = model.SectionCollection;
 			Init();
-			standartFormatter = new StandardFormatter();
 		}
 		
 		public virtual void SetupRenderer () {
@@ -117,13 +114,13 @@ namespace SharpReportCore {
 		
 		#region SharpReport Events
 		
-		protected virtual void PrintReportHeader (object sender, ReportPageEventArgs e) {
+		protected virtual void PrintReportHeader (object sender, ReportPageEventArgs rpea) {
 			SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportHeader,
 			                               CultureInfo.InvariantCulture);
 			this.AddSectionEvents();
 		}
 		
-		protected virtual void PrintPageHeader (object sender, ReportPageEventArgs e) {
+		protected virtual void PrintPageHeader (object sender, ReportPageEventArgs rpea) {
 			SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportPageHeader,
 			                               CultureInfo.InvariantCulture);
 			this.AddSectionEvents();

src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Graphics/BaseShape.cs

@@ -35,12 +35,17 @@ namespace SharpReportCore {
 		
 		public void FillShape (Graphics graphics, Brush brush,RectangleF rectangle) {
 			
+			if (graphics == null) {
+				throw new ArgumentNullException("graphics");
+			}
 			GraphicsPath path1 = this.CreatePath(rectangle);
 			graphics.FillPath(brush, path1);
 
 		}
 		public void FillShape (Graphics graphics,AbstractFillPattern fillPattern,RectangleF rectangle) {
-			
+			if (graphics == null) {
+				throw new ArgumentNullException("graphics");
+			}
 			if (fillPattern != null){
 				using (Brush brush = fillPattern.CreateBrush(rectangle)){
 					if (brush != null){
@@ -54,17 +59,23 @@ namespace SharpReportCore {
 		
 		
 		
-		public void DrawShape(Graphics g, BaseLine line, RectangleF rectangle){
+		public void DrawShape(Graphics graphics, BaseLine line, RectangleF rectangle){
+			if (graphics == null) {
+				throw new ArgumentNullException("graphics");
+			}
 			using (Pen pen = line.CreatePen()){
 				if (pen != null){
-					this.new_DrawShape(g, pen, rectangle);
+					this.new_DrawShape(graphics, pen, rectangle);
 				}
 			}
 		}
 	
-		public void new_DrawShape(Graphics g, Pen pen, RectangleF rectangle){
+		public void new_DrawShape(Graphics graphics, Pen pen, RectangleF rectangle){
+			if (graphics == null) {
+				throw new ArgumentNullException("graphics");
+			}
 			GraphicsPath path1 = this.CreatePath(rectangle);
-			g.DrawPath(pen, path1);
+			graphics.DrawPath(pen, path1);
 		}
 
 

src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderDataReport.cs

@@ -37,7 +37,7 @@ using System.Drawing.Printing;
 namespace SharpReportCore {
 	public class RenderDataReport : AbstractDataRenderer {
 
-		private PointF currentPoint;
+//		private PointF currentPoint;
 		private DataNavigator dataNavigator;
 
 		
@@ -89,8 +89,7 @@ namespace SharpReportCore {
 			base.DoItems(rpea);
 		}
 		
-		//TODO how should we handle ReportFooter, print it on an seperate page ????
+		private void  DoReportFooter (ReportPageEventArgs rpea){
-		private void  DoReportFooter (PointF startAt,ReportPageEventArgs rpea){
 			this.CurrentSection.SectionOffset = (int)rpea.LocationAfterDraw.Y;
 			base.RenderSection (rpea);
 			base.DoItems(rpea);
@@ -100,15 +99,15 @@ namespace SharpReportCore {
 
 		#region test
 		
-		protected override void PrintReportHeader (object sender, ReportPageEventArgs e) {
+		protected override void PrintReportHeader (object sender, ReportPageEventArgs rpea) {
-			base.PrintReportHeader (sender,e);
+			base.PrintReportHeader (sender,rpea);
-			DoReportHeader (e);
+			DoReportHeader (rpea);
 			base.RemoveSectionEvents();
 		}
 		
-		protected override void PrintPageHeader (object sender, ReportPageEventArgs e) {
+		protected override void PrintPageHeader (object sender, ReportPageEventArgs rpea) {
-			base.PrintPageHeader (sender,e);
+			base.PrintPageHeader (sender,rpea);
-			DoPageHeader(e);
+			DoPageHeader(rpea);
 			base.RemoveSectionEvents();
 		}
 		
@@ -124,9 +123,7 @@ namespace SharpReportCore {
 //			DebugFooterRectangle(rpea);
 			this.CurrentSection.SectionOffset = (int)rpea.LocationAfterDraw.Y;
 			base.PrintReportFooter(sender, rpea);
-			DoReportFooter (new PointF(0,
+			this.DoReportFooter(rpea);
-			                           base.CurrentSection.SectionOffset + base.CurrentSection.Size.Height),
-			                rpea);
 			base.RemoveSectionEvents();
 		}
 		
@@ -160,8 +157,8 @@ namespace SharpReportCore {
 		
 		protected override void BodyStart(object sender, ReportPageEventArgs rpea) {
 			base.BodyStart (sender,rpea);
-			this.currentPoint = new PointF (base.CurrentSection.Location.X,
+//			this.currentPoint = new PointF (base.CurrentSection.Location.X,
-			                                base.page.DetailStart.Y);
+//			                                base.page.DetailStart.Y);
 			
 			base.CurrentSection.SectionOffset = (int)this.page.DetailStart.Y + AbstractRenderer.Gap;
 //			base.AddSectionEvents();
@@ -208,8 +205,7 @@ namespace SharpReportCore {
 					return;
 				}
 				
-				int i = base.DoItems(rpea);
+				base.DoItems(rpea);
-				this.currentPoint = new PointF (base.CurrentSection.Location.X, i);
 				firstOnPage = false;
 
 				if (this.dataNavigator.CurrentRow < this.dataNavigator.Count -1) {

src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Text/StandardFormatter.cs

@@ -15,15 +15,15 @@ using System.Globalization;
 /// </summary>
 namespace SharpReportCore {
 	
-	public class StandardFormatter : object {
+	internal class StandardFormatter : object {
 		
+		private StandardFormatter() {
 			
-		public StandardFormatter() {
 		}
 		
 		//TODO why not TypeCode tc = Type.GetTypeCode( Type.GetType(this.dataType));
 		
-		public string FormatItem (string valueToFormat,string format,
+		public static string FormatItem (string valueToFormat,string format,
 		                         TypeCode typeCode,string nullValue) {
 			string retValue = String.Empty;
 			
@@ -35,16 +35,16 @@ namespace SharpReportCore {
 			switch (typeCode) {
 				case TypeCode.Int16:
 				case TypeCode.Int32:
-					retValue = IntegerValues (valueToFormat,format);
+					retValue = StandardFormatter.IntegerValues (valueToFormat,format);
 					break;
 				case TypeCode.DateTime:
-					retValue = DateValues(valueToFormat,format);
+					retValue = StandardFormatter.DateValues(valueToFormat,format);
 					break;
 				case TypeCode.Boolean:
-					retValue = BoolValue (valueToFormat,format);
+					retValue = StandardFormatter.BoolValue (valueToFormat,format);
 					break;
 				case TypeCode.Decimal:
-					retValue = DecimalValues (valueToFormat,format);
+					retValue = StandardFormatter.DecimalValues (valueToFormat,format);
 					break;
 					
 				case TypeCode.Double:
@@ -64,23 +64,8 @@ namespace SharpReportCore {
 		}
 
 		
-		///<summary>Looks witch formatting Class to use, call the approbiate formatter
-		/// and update the DbValue with the formatted String value
-		/// </summary>
-		///<param name="item">A ReportDataItem</param>
-		/// 
-		public string FormatItem (BaseDataItem item) {
 		
-			if (item == null) {
+		private static string BoolValue (string toFormat, string format){
-				throw new ArgumentNullException("item");
-			}
-			return FormatItem(item.DbValue,item.FormatString,
-			                  Type.GetTypeCode( Type.GetType(item.DataType)),
-			                  item.NullValue);
-			
-		}
-		
-		private string BoolValue (string toFormat, string format){
 			string str = String.Empty;
 			try {
 				bool b = bool.Parse (toFormat);
@@ -92,7 +77,7 @@ namespace SharpReportCore {
 			return str;
 		}
 		
-		private  string IntegerValues(string toFormat, string format) {
+		private static string IntegerValues(string toFormat, string format) {
 			string str = String.Empty;
 			if (StandardFormatter.CheckValue (toFormat)) {
 				try {
@@ -112,7 +97,7 @@ namespace SharpReportCore {
 			return str;
 		}
 		
-		private  string DecimalValues(string toFormat, string format) {
+		private static string DecimalValues(string toFormat, string format) {
 			string str = String.Empty;
 			if (StandardFormatter.CheckValue (toFormat)) {
 				try {
@@ -132,7 +117,7 @@ namespace SharpReportCore {
 			return str;
 		}
 		
-		private  string DateValues(string toFormat, string format) {
+		private static string DateValues(string toFormat, string format) {
 			try {
 				DateTime date = DateTime.Parse (toFormat.Trim(),
 				                                CultureInfo.CurrentCulture.DateTimeFormat);

src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Text/TextDrawer.cs

@@ -43,6 +43,9 @@ namespace SharpReportCore {
 		                       RectangleF rectangle,
 		                       StringFormat stringFormat) {
 			
+			if (graphics == null) {
+				throw new ArgumentNullException("graphics");
+			}
 			graphics.DrawString(text,
 			             font,
 			             brush,
@@ -65,15 +68,11 @@ namespace SharpReportCore {
 		}
 		
 		
-		public StringFormat BuildStringFormat(StringTrimming stringTrimming,ContentAlignment alignment){
+		public static StringFormat BuildStringFormat(StringTrimming stringTrimming,ContentAlignment alignment){
 			StringFormat format = StringFormat.GenericTypographic;
 			format.Trimming = stringTrimming;
 			format.FormatFlags = StringFormatFlags.LineLimit;
 
-//			if (base.RightToLeft)
-//			{
-//				format1.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
-//			}
 			
 			if (alignment <= ContentAlignment.MiddleCenter){
 				switch (alignment){

src/AddIns/Misc/SharpReport/SharpReportCore/ReportParameters.cs

@@ -51,9 +51,9 @@ namespace SharpReportCore {
 				}
 				return sqlParameters;
 			}
-			set {
+//			set {
-				sqlParameters = value;
+//				sqlParameters = value;
-			}
+//			}
 		}
 		
 		public ColumnCollection SortColumnCollection {
@@ -63,9 +63,9 @@ namespace SharpReportCore {
 				}
 				return sortColumnCollection;
 			}
-			set {
+//			set {
-				sortColumnCollection = value;
+//				sortColumnCollection = value;
-			}
+//			}
 		}
 		
 	}

src/AddIns/Misc/SharpReport/SharpReportCore/ReportSettings.cs

@@ -115,7 +115,7 @@ namespace SharpReportCore{
 		/// <param name="reader">See XMLFormReader</param>
 		/// <param name="parElement">XmlElement ReportParameter</param>
 		/// <param name="item"><see cref="ReportParameter"</param>
-		private void BuildReportParameter(XmlFormReader reader,
+		private static void BuildReportParameter(XmlFormReader reader,
 		                                  XmlElement parElement,
 		                                  SharpReportCore.AbstractParameter item) {
 			
@@ -192,7 +192,7 @@ namespace SharpReportCore{
 							XmlElement elem = node as XmlElement;
 							if (elem != null) {
 								SqlParameter parameter = new SqlParameter();
-								BuildReportParameter (xmlReader,
+								ReportSettings.BuildReportParameter (xmlReader,
 								                      elem,
 								                      parameter);
 								reportParametersCollection.Add(parameter);
@@ -308,7 +308,7 @@ namespace SharpReportCore{
 		}
 		
 		
-		private void SaveCollectionItems (XmlElement xmlSaveTo,AbstractColumn column,PropertyInfo [] prop) {
+		private static void SaveCollectionItems (XmlElement xmlSaveTo,AbstractColumn column,PropertyInfo [] prop) {
 			XmlElement xmlProperty = null;
 			XmlAttribute attPropValue;
 			foreach (PropertyInfo p in prop) {
@@ -352,7 +352,7 @@ namespace SharpReportCore{
 					Type type = column.GetType();
 					PropertyInfo [] prop = type.GetProperties();
 					XmlElement ctrl = xmlSection.OwnerDocument.CreateElement ("sorting");
-					SaveCollectionItems(ctrl,column,prop);
+					ReportSettings.SaveCollectionItems(ctrl,column,prop);
 					xmlSection.AppendChild(ctrl);
 				}
 			} catch (Exception) {
@@ -366,7 +366,7 @@ namespace SharpReportCore{
 					Type type = column.GetType();
 					PropertyInfo [] prop = type.GetProperties();
 					XmlElement ctrl = xmlSection.OwnerDocument.CreateElement ("grouping");
-					SaveCollectionItems(ctrl,column,prop);
+					ReportSettings.SaveCollectionItems(ctrl,column,prop);
 					xmlSection.AppendChild(ctrl);
 				}
 			} catch (Exception) {
@@ -380,7 +380,7 @@ namespace SharpReportCore{
 					Type type = column.GetType();
 					PropertyInfo [] prop = type.GetProperties();
 					XmlElement ctrl = xmlSection.OwnerDocument.CreateElement ("column");
-					SaveCollectionItems(ctrl,column,prop);
+					ReportSettings.SaveCollectionItems(ctrl,column,prop);
 					xmlSection.AppendChild(ctrl);
 				}
 			} catch (Exception) {
@@ -486,9 +486,9 @@ namespace SharpReportCore{
 			 */
 		}
 		
-		public float DrawAreaHeight (ReportPageEventArgs rpea){
+//		public float DrawAreaHeight (ReportPageEventArgs rpea){
-			return 0;
+//			return 0;
-		}
+//		}
 		
 		#endregion
 		

src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs

@@ -102,37 +102,10 @@ namespace SharpReportCore {
 		}
 		
 		
-		private static void SetSqlParameters (ReportModel model,AbstractParametersCollection sqlParams) {
-			if ((sqlParams == null)||(sqlParams.Count == 0)) {
-				return;
-			}
-			model.ReportSettings.SqlParametersCollection.Clear();
-			model.ReportSettings.SqlParametersCollection.AddRange(sqlParams);
-		}
-		
-		
-		
-		private static void SetCustomSorting (ReportModel model,ColumnCollection sortParams) {
-			if ((sortParams == null)||(sortParams.Count == 0)) {
-				return;
-			}
-			model.ReportSettings.SortColumnCollection.Clear();
-			model.ReportSettings.SortColumnCollection.AddRange(sortParams);
-		}
-		
-		
 		#endregion
 		
 		#region Setup for print/preview
-		/*
+		
-		private static  bool CheckForPushModel (ReportModel model) {
-			if (model.ReportSettings.DataModel == GlobalEnums.enmPushPullModel.PushData) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-*/
 		private ReportModel ValidatePushModel (string fileName) {
 			
 			ReportModel model = ModelFromFile (fileName);
@@ -166,7 +139,7 @@ namespace SharpReportCore {
 		}
 		
 		
-		protected ColumnCollection CollectFieldsFromModel(ReportModel model){
+		protected static ColumnCollection CollectFieldsFromModel(ReportModel model){
 			if (model == null) {
 				throw new ArgumentNullException("model");
 			}
@@ -508,6 +481,7 @@ namespace SharpReportCore {
 			}
 		}
 		
+		/*
 		/// <summary>
 		/// Print a PullModel Report
 		/// </summary>
@@ -538,7 +512,7 @@ namespace SharpReportCore {
 				throw;
 			}
 		}
-		
+		*/
 		
 		/// <summary>
 		/// Print a PushModel Report, if <see cref="UseStandartPrinter"></see> in
@@ -580,7 +554,7 @@ namespace SharpReportCore {
 		/// <param name="fileName"></param>
 		/// <returns><see cref="ReportModel"></see></returns>
 		
-		protected ReportModel ModelFromFile (string fileName) {
+		protected static ReportModel ModelFromFile (string fileName) {
 			if (String.IsNullOrEmpty(fileName)) {
 				throw new ArgumentNullException("fileName");
 			}