Applied some rules from FxCop

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

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

@@ -85,7 +85,7 @@ namespace SharpReport{
 				return new ColumnCollection();
 			}
 	
-			if (baseDesignerControl.ReportModel.ReportSettings.DataModel.Equals(GlobalEnums.enmPushPullModel.PushData)) {
+			if (baseDesignerControl.ReportModel.DataModel.Equals(GlobalEnums.enmPushPullModel.PushData)) {
 				return new ColumnCollection();
 			}
 			// PullData, query the Datasource and ask for the available Fields
@@ -93,7 +93,7 @@ namespace SharpReport{
 				base.ConnectionObject = this.BuildConnectionObject(baseDesignerControl.ReportModel.ReportSettings);
 			}
 			
-			if (this.baseDesignerControl.ReportModel.ReportSettings.DataModel.Equals(GlobalEnums.enmPushPullModel.PullData)){
+			if (this.baseDesignerControl.ReportModel.DataModel.Equals(GlobalEnums.enmPushPullModel.PullData)){
 				
 				using (dataManager = new DataManager(base.ConnectionObject,
 				                                     baseDesignerControl.ReportModel.ReportSettings)) {
@@ -103,21 +103,14 @@ namespace SharpReport{
 			}
 			
 			//Pushdata, we walk thru all sections and collect the ReportDataItems
-			if (this.baseDesignerControl.ReportModel.ReportSettings.DataModel == GlobalEnums.enmPushPullModel.PushData) {
+			if (this.baseDesignerControl.ReportModel.DataModel == GlobalEnums.enmPushPullModel.PushData) {
 				return base.CollectFieldsFromModel(this.baseDesignerControl.ReportModel);
 			}
 			throw new ArgumentOutOfRangeException("SharpReportManager:ReadColumnCollection");
 		}
 		
 		
-		private AbstractRenderer BuildRenderer (ReportModel model) {
 		
-			System.Console.WriteLine("BuildRenderer");
-			if (base.ConnectionObject == null) {
-				base.ConnectionObject = this.BuildConnectionObject(model.ReportSettings);
-			}
-			return  base.AbstractRenderer(model);
-		}
 		
 		
 		private void AddItemsToSection (BaseSection section,ReportItemCollection collection) {
@@ -322,12 +315,13 @@ namespace SharpReport{
 		
 		#region Preview
 		
-		public  AbstractRenderer GetRenderer (ReportModel model) {
+		
+		public  AbstractRenderer GetRendererForStandartReports (ReportModel model) {
 			System.Console.WriteLine("Manager.GetRenderer");
 			if (model == null) {
-				throw new ArgumentException("SharpReportManager:GetRenderer 'ReportModel'");
+				throw new ArgumentException("SharpReportManager:GetRendererForStandartReports 'ReportModel'");
 			}
-			return this.BuildRenderer (model);
+			return this.BuildStandartRenderer (model);
 		}
 		
 		/// <summary>
@@ -335,21 +329,11 @@ namespace SharpReport{
 		/// </summary>
 		/// <param name="model"><see cref="">ReportModel</see></param>
 		/// <param name="showInUserControl"></param>
-		public void ReportPreview (ReportModel model,bool showInUserControl) {
+		public void ReportPreview (ReportModel model,bool standAlone) {
 			try {
-				System.Console.WriteLine("");
-				System.Console.WriteLine("Manager:ReportPreview");
-				System.Console.WriteLine("");
-				AbstractRenderer abstr = this.BuildRenderer (model);
-				
+				AbstractRenderer abstr = this.BuildStandartRenderer (model);
 				if (abstr != null) {
-					if (abstr.Cancel == false) {
-						if (showInUserControl){
-							PreviewControl.ShowPreviewWithUserControl (abstr,1.5);
-						} else {
-							PreviewControl.ShowPreviewWithDialog (abstr,1.5);
-						}
-					}
+					PreviewControl.ShowPreview (abstr,1.5,standAlone);
 				}
 				
 			} catch (Exception ) {
@@ -357,21 +341,41 @@ namespace SharpReport{
 			}
 		}
 		
+		private AbstractRenderer BuildStandartRenderer (ReportModel model) {
+			if (model == null) {
+				throw new ArgumentException("SharpReportManager:BuildStandartRenderer 'ReportModel'");
+			}
+			
+			if (base.ConnectionObject == null) {
+				base.ConnectionObject = this.BuildConnectionObject(model.ReportSettings);
+			}
+			return  base.AbstractRenderer(model);
+		}
+		
+		
+		public AbstractRenderer GetRendererForPushDataReports (ReportModel model,DataSet dataSet) {
+			if (model == null) {
+				throw new ArgumentException("SharpReportManager:GetRendererForPushDataReports 'ReportModel'");
+			}
+			if (dataSet == null) {
+				throw new ArgumentException("SharpReportManager:GetRendererForPushDataReports 'DataSet'");
+			}
+			return base.SetupPushDataRenderer(model,dataSet.Tables[0]);
+		}
+		
+		
 		public void ReportPreviewPushData (ReportModel model,
-		                                   DataTable dataTable,
-		                                   bool showInUserControl) {
-			try {
-				System.Console.WriteLine("PreviewPushData with {0} Rows in Table",dataTable.Rows.Count);
-				AbstractRenderer abstr = base.SetupPushDataRenderer(model,dataTable);
+		                                   DataSet dataSet,
+		                                   bool standAlone) {
+			if (model == null) {
+				throw new ArgumentException("SharpReportManager:ReportPreviewPushData 'ReportModel'");
+			}
 			
+			try {
+				AbstractRenderer abstr = GetRendererForPushDataReports (model,dataSet);
 				if (abstr != null) {
-					if (abstr.Cancel == false) {
-						if (showInUserControl){
-							PreviewControl.ShowPreviewWithUserControl (abstr,1.5);
-						} else {
-							PreviewControl.ShowPreviewWithDialog (abstr,1.5);
-						}
-					}
+					
+					PreviewControl.ShowPreview (abstr,1.5,standAlone);
 				}
 				
 			} catch (Exception) {

src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs

@@ -202,32 +202,42 @@ namespace SharpReportAddin{
 		
 		#region Preview handling
 		
+		private DataSet DataSetFromFile () {
+			DataSet ds = new DataSet();
+			using (OpenFileDialog openFileDialog = new OpenFileDialog()){
+				openFileDialog.Filter = GlobalValues.XsdFileFilter;
+				openFileDialog.DefaultExt = GlobalValues.XsdExtension;
+				openFileDialog.AddExtension    = true;
+				if(openFileDialog.ShowDialog() == DialogResult.OK){
+					if (openFileDialog.FileName.Length > 0) {
+						
+						ds.ReadXml (openFileDialog.FileName);
+					}
+				}
+			}
+			return ds;
+		}
 		
 		private void RunPreview(bool standAlone) {
 			base.OnSaving(EventArgs.Empty);
-			
-			System.Console.WriteLine("View:RunPreview for <{0}>",designerControl.ReportModel.ReportSettings.DataModel);
 			try {
-				switch (designerControl.ReportModel.ReportSettings.DataModel) {
-					case GlobalEnums.enmPushPullModel.FormSheet : {
-						System.Console.WriteLine("\tFormSheet");
-						PreviewStandartReport(standAlone);
-						break;
-					}
-					case GlobalEnums.enmPushPullModel.PullData:{
-						System.Console.WriteLine("\tPullData");	
-						PreviewStandartReport(standAlone);
-						break;
-					}
-					case GlobalEnums.enmPushPullModel.PushData:{
-						System.Console.WriteLine("\tPushData");
-						PreviewPushReport (standAlone);
-						break;
-					}
-				default:
-					throw new SharpReportException("Wrong ReportType");
+				switch (designerControl.ReportModel.DataModel) {
+						case GlobalEnums.enmPushPullModel.FormSheet : {
+							PreviewStandartReport(standAlone);
+							break;
+						}
+						case GlobalEnums.enmPushPullModel.PullData:{
+							PreviewStandartReport(standAlone);
+							break;
+						}
+						case GlobalEnums.enmPushPullModel.PushData:{
+							PreviewPushReport (standAlone);
+							break;
+						}
+					default:
+						throw new SharpReportException("Wrong ReportType");
 						
-			}
+				}
 			} catch (Exception e) {
 				MessageBox.Show("Error in RunPreview" + e.Message);
 			}
@@ -237,23 +247,11 @@ namespace SharpReportAddin{
 		
 		
 		private void PreviewPushReport (bool standAlone){
-			System.Console.WriteLine("View:PreviewPushDataReport");
 			try {
-				using (OpenFileDialog openFileDialog = new OpenFileDialog()){
-					openFileDialog.Filter = GlobalValues.XsdFileFilter;
-					openFileDialog.DefaultExt = GlobalValues.XsdExtension;
-					openFileDialog.AddExtension    = true;
-					
-					if(openFileDialog.ShowDialog() == DialogResult.OK){
-						if (openFileDialog.FileName.Length > 0) {
-							DataSet ds = new DataSet();
-							ds.ReadXml (openFileDialog.FileName);
-							reportManager.ReportPreviewPushData(designerControl.ReportModel,
-							                                    ds.Tables[0],
-							                                    standAlone);
-						}
-					}
-				}
+				DataSet ds = DataSetFromFile ();
+				reportManager.ReportPreviewPushData(designerControl.ReportModel,
+				                                    ds,
+				                                    standAlone);
 			}catch (Exception e){
 				MessageService.ShowError (e,e.Message);
 			}
@@ -261,12 +259,12 @@ namespace SharpReportAddin{
 		
 		
 		private void PreviewStandartReport(bool standAlone){
-			System.Console.WriteLine("View:PreviewStandartReport");
-			reportManager.NoData -= new SharpReportEventHandler (OnNoDataForReport);
-			reportManager.NoData += new SharpReportEventHandler (OnNoDataForReport);
+			reportManager.NoData -= new EventHandler<SharpReportEventArgs> (OnNoDataForReport);
+			reportManager.NoData += new EventHandler<SharpReportEventArgs> (OnNoDataForReport);
+			
+			reportManager.ParametersRequest -= new EventHandler<SharpReportParametersEventArgs> (OnParametersRequest);
+			reportManager.ParametersRequest +=  new EventHandler<SharpReportParametersEventArgs>(OnParametersRequest);
 			
-			reportManager.ParametersRequest -= new SharpReportParametersEventHandler (OnParametersRequest);
-			reportManager.ParametersRequest += new SharpReportParametersEventHandler (OnParametersRequest);
 			reportManager.ReportPreview (designerControl.ReportModel, standAlone);
 			
 		}
@@ -381,16 +379,12 @@ namespace SharpReportAddin{
 		/// Show's Report in PreviewControl
 		/// </summary>
 		public void OnPreviewClick () {
-			reportManager.NoData -= new SharpReportEventHandler (OnNoDataForReport);
-			reportManager.NoData += new SharpReportEventHandler (OnNoDataForReport);
+			reportManager.NoData -= new EventHandler<SharpReportEventArgs> (OnNoDataForReport);
+			reportManager.NoData += new EventHandler<SharpReportEventArgs> (OnNoDataForReport);
 			
-			reportManager.ParametersRequest -= new SharpReportParametersEventHandler (OnParametersRequest);
-			reportManager.ParametersRequest += new SharpReportParametersEventHandler (OnParametersRequest);
+			reportManager.ParametersRequest -= new EventHandler<SharpReportParametersEventArgs> (OnParametersRequest);
+			reportManager.ParametersRequest +=  new EventHandler<SharpReportParametersEventArgs>(OnParametersRequest);
 			base.OnSaving(EventArgs.Empty);
-			System.Console.WriteLine("");
-			System.Console.WriteLine("!! OnPreviewClick !!");
-//			reportManager.ReportPreview (designerControl.ReportModel,
-//			                             false);
 			this.RunPreview(false);
 		}
 
@@ -562,11 +556,14 @@ namespace SharpReportAddin{
 			get {
 				System.Console.WriteLine("");
 				System.Console.WriteLine("!! PrintDocument  !!");
+				AbstractRenderer renderer;
+				if (this.designerControl.ReportModel.DataModel == GlobalEnums.enmPushPullModel.PushData) {
+					renderer = reportManager.GetRendererForPushDataReports(this.designerControl.ReportModel,
+					                                                       this.DataSetFromFile());
 					
-				 if (this.designerControl.ReportModel.ReportSettings.DataModel == GlobalEnums.enmPushPullModel.PushData) {
-					MessageService.ShowMessage("PushModel currently not supported");
+				} else {
+					renderer = reportManager.GetRendererForStandartReports(this.designerControl.ReportModel);
 				}
-				AbstractRenderer renderer = reportManager.GetRenderer(this.designerControl.ReportModel);
 				return renderer.ReportDocument;
 			}
 		}

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

@@ -32,8 +32,11 @@ namespace SharpReportCore {
 		}
 		
 		
-		protected  SizeF MeasureReportItem (SharpReportCore.ReportPageEventArgs e,IItemRenderer item) {
-				return new SizeF (item.Size.Width,item.Size.Height);
+		protected  SizeF MeasureReportItem (SharpReportCore.ReportPageEventArgs rpea,IItemRenderer item) {
+			if (item == null) {
+				throw new ArgumentException(this.Name);
+			}
+			return new SizeF (item.Size.Width,item.Size.Height);
 		}
 		
 		

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

@@ -31,7 +31,7 @@ namespace SharpReportCore {
 		private Font font;
 		private ISite site;
 		
-		public event FormatOutputEventHandler FormatOutput;
+		public event EventHandler <FormatOutputEventArgs> FormatOutput;
 		public event EventHandler Disposed;
 		
 		public BaseReportItem() :base(){

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

@@ -42,8 +42,9 @@ namespace SharpReportCore {
 		private int  sectionOffset = 0;
 		private int sectionMargin = 0;
 
-		public event BeforePrintEventHandler BeforePrint;
-		public event AfterPrintEventHandler AfterPrint;
+		public event EventHandler<EventArgs> BeforePrint;
+		public event EventHandler<AfterPrintEventArgs> AfterPrint;
+		
 		
 		#region SharpReportCore.IPropertyChange interface implementation
 		public event PropertyChangedEventHandler PropertyChanged;

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

@@ -33,11 +33,11 @@ namespace SharpReportCore {
 			this.standartStringFormat = GlobalValues.StandartStringFormat();
 		}
 		
-		public override void Render(ReportPageEventArgs e) {
-			base.Render(e);
-			RectangleF rect = PrepareRectangle (e,this.Text);
-			PrintTheStuff (e,this.Text,rect);
-			base.OnAfterPrint (e.LocationAfterDraw);
+		public override void Render(ReportPageEventArgs rpea) {
+			base.Render(rpea);
+			RectangleF rect = PrepareRectangle (rpea,this.Text);
+			PrintTheStuff (rpea,this.Text,rect);
+			base.OnAfterPrint (rpea.LocationAfterDraw);
 		}
 		
 		public override string ToString() {
@@ -66,10 +66,10 @@ namespace SharpReportCore {
 		/// Measure the Size of the String rectangle
 		/// </summary>
 		
-		private SizeF MeasureReportItem (ReportPageEventArgs e,string text) {
+		private SizeF MeasureReportItem (ReportPageEventArgs rpea,string text) {
 			SizeF measureSizeF = new SizeF ();
 			
-			measureSizeF = e.PrintPageEventArgs.Graphics.MeasureString(text,
+			measureSizeF = rpea.PrintPageEventArgs.Graphics.MeasureString(text,
 			                                                          this.Font,
 			                                                          this.Size.Width,
 			                                                          StandartStringFormat);
@@ -83,22 +83,24 @@ namespace SharpReportCore {
 		/// <param name="toPrint">Formatted String toprint</param>
 		/// <param name="rectangle">rectangle where to draw the string</param>
 	
-		protected void PrintTheStuff (ReportPageEventArgs e,
+		protected void PrintTheStuff (ReportPageEventArgs rpea,
 		                              string toPrint,
 		                              RectangleF rectangle ) {
 			
-			
+			if (rpea == null) {
+				throw new ArgumentException (this.Name);
+			}
 			StringFormat fmt = StandartStringFormat;
 			fmt.Alignment = this.StringAlignment;
 			
-			textDrawer.DrawString(e.PrintPageEventArgs.Graphics,
+			textDrawer.DrawString(rpea.PrintPageEventArgs.Graphics,
 			                      toPrint,
 			                      this.Font,
 			                      new SolidBrush(this.ForeColor),
 			                      rectangle,
 			                      fmt);
 
-			e.LocationAfterDraw = new PointF (this.Location.X + this.Size.Width,
+			rpea.LocationAfterDraw = new PointF (this.Location.X + this.Size.Width,
 			                                  this.Location.Y + this.Size.Height);
 		}
 	

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

@@ -59,21 +59,23 @@ namespace SharpReportCore {
 		}
 		
 		public BaseSettings(PageSettings pageSettings , string reportName,string fileName){
-			if (reportName == "") {
+			if (pageSettings == null) {
+				throw new ArgumentException("BaseSettings:PageSettings");
+			}
+			
+			if (String.IsNullOrEmpty(reportName)) {
 				this.reportName = GlobalValues.SharpReportStandartFileName;
 			} else {
 				this.reportName = reportName;
 			}
 			
-			if (fileName == "") {
+			if (String.IsNullOrEmpty(fileName)) {
 				this.fileName = GlobalValues.SharpReportPlainFileName;
 			} else {
 				this.fileName = MakePoperFilename(fileName);
 			}
 			
-			if (pageSettings == null) {
-				throw new ArgumentException("BaseSettings:pageSettings");
-			}
+			
 			this.pageSettings = pageSettings;
 			
 			
@@ -101,7 +103,7 @@ namespace SharpReportCore {
 		}
 		#endregion
 		
-		protected void FirePropertyChanged() {
+		protected void NotifyPropertyChanged() {
 			if (this.initDone) {
 				if (PropertyChanged != null) {
 					PropertyChanged (this,new EventArgs());
@@ -144,7 +146,7 @@ namespace SharpReportCore {
 			set {
 				if (includeSettings != value) {
 					includeSettings = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}
@@ -161,7 +163,7 @@ namespace SharpReportCore {
 			set {
 				if (reportName != value) {
 					reportName = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}
@@ -179,7 +181,7 @@ namespace SharpReportCore {
 			set {
 				if (fileName != value) {
 					fileName = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 					if (FileNameChanged != null ){
 						FileNameChanged (this,EventArgs.Empty);
 					}
@@ -196,7 +198,7 @@ namespace SharpReportCore {
 			set {
 				if (useStandartPrinter != value) {
 					useStandartPrinter = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}
@@ -210,7 +212,7 @@ namespace SharpReportCore {
 			}
 			set {
 				this.pageSettings = value;
-				this.FirePropertyChanged();
+				this.NotifyPropertyChanged();
 			}
 		}
 		
@@ -224,7 +226,7 @@ namespace SharpReportCore {
 				if (defaultMargins != value) {
 					defaultMargins = value;
 					PageSettings.Margins = defaultMargins;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 				
 			}
@@ -238,7 +240,7 @@ namespace SharpReportCore {
 			set {
 				if (graphicsUnit != value) {
 					graphicsUnit = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}

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

@@ -20,7 +20,7 @@ using System.Data.OleDb;
 /// </remarks>
 
 namespace SharpReportCore {
-	public class ConnectionObject : object {
+	public class ConnectionObject : object,IDisposable {
 		IDbConnection connection;
 		string password;
 		string username;
@@ -80,6 +80,14 @@ namespace SharpReportCore {
 //				return connectionString;
 //			}
 //		}
+		public void Dispose(){
+			if (this.connection != null) {
+				if (this.connection.State == ConnectionState.Open) {
+					this.connection.Close();
+				}
+				this.connection.Dispose();
+			}
+		}
 		
 	}
 }

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

@@ -49,7 +49,7 @@ namespace SharpReportCore {
 		private ListChangedEventArgs resetList = new ListChangedEventArgs(ListChangedType.Reset,-1,-1);
 		
 		public event ListChangedEventHandler ListChanged;
-		public event GroupChangedEventHandler GroupChanged;
+		public event EventHandler <GroupChangedEventArgs> GroupChanged;
 		
 		/// <summary>
 		/// use this Constructor for PullDataReports
@@ -141,7 +141,7 @@ System.Console.WriteLine("CheckAndSetReportSettings");
 				
 			} catch (Exception e) {
 				MessageBox.Show (e.Message);
-				throw e;
+				throw ;
 			}
 			
 			this.reportSettings = settings;
@@ -160,7 +160,6 @@ System.Console.WriteLine("CheckAndSetReportSettings");
 				if (source is DataTable) {
 					DataTable tbl = source as DataTable;
 					this.dataMember = tbl.TableName;
-					System.Console.WriteLine("\t Source = table with {0}",tbl.Rows.Count);
 					return;
 				}
 				
@@ -397,7 +396,7 @@ System.Console.WriteLine("CheckAndSetReportSettings");
 		
 		public bool DataBind() {
 			this.dataViewStrategy.Bind();
-			this.dataViewStrategy.GroupChanged += new GroupChangedEventHandler(OnGroupChange);
+			this.dataViewStrategy.GroupChanged += new EventHandler <GroupChangedEventArgs>(OnGroupChange);
 			CheckReportColumns();
 			return true;
 		}

src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/ListStrategy/BaseListStrategy.cs

@@ -37,7 +37,7 @@ namespace SharpReportCore {
 		private ListChangedEventArgs resetList = new ListChangedEventArgs(ListChangedType.Reset,-1,-1);
 		
 		public event ListChangedEventHandler ListChanged;
-		public event GroupChangedEventHandler GroupChanged;
+		public event EventHandler <GroupChangedEventArgs> GroupChanged;
 		
 		#region Constructor
 		public BaseListStrategy(ReportSettings reportSettings) {

src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/ListStrategy/CollectionStrategy.cs

@@ -96,8 +96,8 @@ namespace SharpReportCore {
 					}
 					sortValues.Add(new SortComparer(col, rowIndex, values));
 				}
-			} catch (Exception e) {
-				throw e;
+			} catch (Exception) {
+				throw ;
 			}
 			
 			sortValues.Sort();
@@ -122,8 +122,8 @@ namespace SharpReportCore {
 					values[0] = rowIndex;
 					sortValues.Add(new BaseComparer(col, rowIndex, values));
 				}
-			} catch (Exception e) {
-				throw e;
+			} catch (Exception) {
+				throw ;
 			}
 			return sortValues;;
 		}

src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/ListStrategy/TableStrategy.cs

@@ -24,7 +24,7 @@ namespace SharpReportCore {
 	/// 	created by - Forstmeier Peter
 	/// 	created on - 23.10.2005 15:12:06
 	/// </remarks>
-	public class TableStrategy : BaseListStrategy {
+	public class TableStrategy : BaseListStrategy,IDisposable {
 		
 		DataTable table;
 		DataView view = new DataView();
@@ -105,8 +105,8 @@ namespace SharpReportCore {
 					values[0] = rowIndex;
 					sortValues.Add(new BaseComparer(col, rowIndex, values));
 				}
-			} catch (Exception e) {
-				throw e;
+			} catch (Exception) {
+				throw ;
 			}
 			return sortValues;;
 		}
@@ -368,5 +368,14 @@ namespace SharpReportCore {
 		
 		#endregion
 		
+		#region IDisposable
+		public void Dispose(){
+			if (this.view != null) {
+				this.view.Dispose();
+			}
+		}
+		
+		#endregion
+		
 	}
 }

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

@@ -19,6 +19,7 @@ namespace SharpReportCore
 	internal class SqlQueryCkecker{
 		internal string UPDATE = "UPDATE";
 		internal string DELETE = "DELETE";
+		internal string INSERT = "INSERT";
 		internal string noValidMessage = "is no valid Member of SqlString";
 		private string queryString;
 		
@@ -38,7 +39,11 @@ namespace SharpReportCore
 				if (this.queryString.IndexOf(this.DELETE) > -1)  {
 					this.Invalid (this.DELETE);
 					string str = String.Format("{0} is no valid Member of SqlString",this.DELETE);
+				}
 				
+				if (this.queryString.IndexOf(this.INSERT) > -1)  {
+					this.Invalid (this.INSERT);
+					string str = String.Format("{0} is no valid Member of SqlString",this.DELETE);
 				}
 			}
 		}

src/AddIns/Misc/SharpReport/SharpReportCore/Dialogs/PreviewControl.cs

@@ -28,19 +28,21 @@ namespace SharpReportCore{
 		private System.Windows.Forms.PrintPreviewControl printPreviewControl1;
 		private System.Windows.Forms.PrintPreviewDialog previewDlg;
 
-		public PreviewControl()
-		{
+		public PreviewControl(){
 			InitializeComponent();
-			this.SetStyle(ControlStyles.DoubleBuffer |
-			              ControlStyles.UserPaint |
-			              ControlStyles.AllPaintingInWmPaint |
-			              ControlStyles.ResizeRedraw,
-			              true);
-			this.UpdateStyles();
 		}
 		
-		public void ShowPreviewWithUserControl (AbstractRenderer renderer,double zoomFaktor) {
-			System.Console.WriteLine("PaintArea:WithUserControl");
+		public void ShowPreview (AbstractRenderer renderer,double zoomFaktor,bool standAlone) {
+			if (renderer.Cancel == false) {
+				if (standAlone) {
+					this.ShowPreviewWithUserControl (renderer,1.5);
+				} else {
+					ShowPreviewWithDialog(renderer,1.5);
+				}
+			}
+		}
+		
+		private void ShowPreviewWithUserControl (AbstractRenderer renderer,double zoomFaktor) {
 			
 			System.Drawing.Printing.PrintDocument  doc = renderer.ReportDocument;
 			
@@ -66,7 +68,7 @@ namespace SharpReportCore{
 			printPreviewControl1.UseAntiAlias = true;
 		}
 		
-		public void ShowPreviewWithDialog (AbstractRenderer renderer,double zoomFaktor) {
+		private void ShowPreviewWithDialog (AbstractRenderer renderer,double zoomFaktor) {
 			System.Console.WriteLine("PaintArea:WithDialog");
 			System.Drawing.Printing.PrintDocument  doc = renderer.ReportDocument;
 		

src/AddIns/Misc/SharpReport/SharpReportCore/Events/AfterPrintEventArgs.cs

@@ -23,9 +23,6 @@ using System.Drawing;
 	
 namespace SharpReportCore {
 		
-	public delegate void BeforePrintEventHandler(object sender, EventArgs e);
-	public delegate void AfterPrintEventHandler(object sender, AfterPrintEventArgs e);
-		
 	public class AfterPrintEventArgs : System.EventArgs {
 		PointF toPoint;
 		

src/AddIns/Misc/SharpReport/SharpReportCore/Events/GroupChangedEventArgs.cs

@@ -17,7 +17,6 @@ using System;
 /// 	created on - 29.11.2005 16:48:53
 /// </remarks>
 namespace SharpReportCore {
-	public delegate void GroupChangedEventHandler(object sender, GroupChangedEventArgs e);
 	
 	public class GroupChangedEventArgs : System.EventArgs {
 		

src/AddIns/Misc/SharpReport/SharpReportCore/Events/ReportPageEventArgs.cs

@@ -17,11 +17,12 @@ using System.Drawing.Printing;
 	/// 
 	/// </summary>
 	/// <remarks>
-	/// 	created by - Forstmeier Helmut
+	/// 	created by - Forstmeier Peter
 	/// 	created on - 21.11.2004 14:59:06
 	/// </remarks>
 namespace SharpReportCore {	
-	public class ReportPageEventArgs : System.EventArgs {
+	
+		public class ReportPageEventArgs : System.EventArgs {
 		
 		/// <summary>
 		/// Default constructor - initializes all fields to default values

src/AddIns/Misc/SharpReport/SharpReportCore/Events/SharpReportEventArgs.cs

@@ -20,8 +20,6 @@ namespace SharpReportCore {
 	/// 	created on - 21.06.2005 23:10:57
 	/// </remarks>
 	
-	// SharpReportEvent
-	public delegate void SharpReportEventHandler (object sender,SharpReportEventArgs e);
 	
 	public class SharpReportEventArgs : System.EventArgs {
 		

src/AddIns/Misc/SharpReport/SharpReportCore/Events/SharpReportParametersEventArgs.cs

@@ -21,8 +21,6 @@ namespace SharpReportCore {
 	/// 	created on - 23.06.2005 22:55:10
 	/// </remarks>
 	
-	public delegate void SharpReportParametersEventHandler (object sender,
-	                                                       SharpReportParametersEventArgs e);
 	
 	public class SharpReportParametersEventArgs : System.EventArgs {
 		

src/AddIns/Misc/SharpReport/SharpReportCore/Exceptions/IllegalFileFormat.cs

@@ -19,7 +19,7 @@ using System;
 	/// </remarks>
 namespace SharpReportCore {	
 	
-	public class IllegalFileFormatException : System.ApplicationException {
+	public class IllegalFileFormatException : System.Exception {
 		static string errMess = "<aus code> Could not read file , file corrupt (SharpReportFile is improperly formatted)";
 		
 		private string localisedMessage = String.Empty;

src/AddIns/Misc/SharpReport/SharpReportCore/Exceptions/MissingDataSourceException.cs

@@ -22,7 +22,7 @@ using System;
 /// </remarks>
 	
 namespace SharpReportCore {	
-	public class MissingDataSourceException : System.ApplicationException {
+	public class MissingDataSourceException : System.Exception {
 		
 		string errorMessage = String.Empty;
 		

src/AddIns/Misc/SharpReport/SharpReportCore/Exceptions/SharpReportException.cs

@@ -21,7 +21,7 @@ using System.Windows.Forms;
 	/// </remarks>
 	/// 
 namespace SharpReportCore {	
-	public class SharpReportException : System.ApplicationException {
+	public class SharpReportException : System.Exception {
 		
 		
 		string errorMessage = String.Empty;

src/AddIns/Misc/SharpReport/SharpReportCore/Interfaces/IDataViewStrategy.cs

@@ -83,6 +83,6 @@ namespace SharpReportCore{
  		/// <summary>
  		/// Fired each tim the grouping will change, this means theGroupLevel changes up or down
  		/// </summary>
- 		event GroupChangedEventHandler GroupChanged;
+ 		event EventHandler <GroupChangedEventArgs> GroupChanged;
 	}
 }

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

@@ -37,7 +37,7 @@ using SharpReportCore;
 	/// </remarks>
 	/// 
 namespace SharpReportCore {
-	public abstract class AbstractRenderer : object {
+	public abstract class AbstractRenderer : object,IDisposable {
 		private const int gap = 1;
 		
 		private ReportDocument reportDocument;
@@ -70,11 +70,11 @@ namespace SharpReportCore {
 			
 			reportDocument.QueryPage += new QueryPageSettingsEventHandler (ReportQueryPage);
 			
-			reportDocument.ReportBegin += new ReportPageEventHandler (ReportBegin);
-			reportDocument.PrintPageBegin += new ReportPageEventHandler (BeginPrintPage);
-			reportDocument.PrintPageBodyStart += new ReportPageEventHandler (PrintBodyStart);
-			reportDocument.PrintPageBodyEnd += new ReportPageEventHandler (PrintBodyEnd);
-			reportDocument.PrintPageEnd += new ReportPageEventHandler (PrintPageEnd);
+			reportDocument.ReportBegin += new EventHandler<ReportPageEventArgs> (ReportBegin);
+			reportDocument.PrintPageBegin +=  new EventHandler<ReportPageEventArgs>(BeginPrintPage);
+			reportDocument.PrintPageBodyStart += new EventHandler<ReportPageEventArgs> (PrintBodyStart);
+			reportDocument.PrintPageBodyEnd += new EventHandler<ReportPageEventArgs> (PrintBodyEnd);
+			reportDocument.PrintPageEnd += new EventHandler<ReportPageEventArgs> (PrintPageEnd);
 			reportDocument.DocumentName = reportSettings.ReportName;
 		}
 		
@@ -184,8 +184,8 @@ namespace SharpReportCore {
 					}
 					rItem.Offset = section.SectionOffset;
 
-					rItem.FormatOutput -= new FormatOutputEventHandler (FormatBaseReportItem);
-					rItem.FormatOutput += new FormatOutputEventHandler (FormatBaseReportItem);
+					rItem.FormatOutput -= new EventHandler<FormatOutputEventArgs> (FormatBaseReportItem);
+					rItem.FormatOutput += new EventHandler<FormatOutputEventArgs> (FormatBaseReportItem);
 					
 					rItem.Render(e);
 
@@ -396,5 +396,12 @@ namespace SharpReportCore {
 			}
 		}
 		#endregion
+		#region IDispoable
+		public void Dispose(){
+			if (this.reportDocument != null) {
+				this.reportDocument.Dispose();
+			}
+		}
+		#endregion
 	}
 }

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

@@ -11,7 +11,6 @@ using System;
 	/// This Delegate is used to format the output from TextBased Items
 	/// </summary>
 namespace SharpReportCore {
-	public delegate void FormatOutputEventHandler (object sender,FormatOutputEventArgs e);
 	
 	public class FormatOutputEventArgs : System.EventArgs {
 		

src/AddIns/Misc/SharpReport/SharpReportCore/Printing/Formatter/DefaultFormatter.cs

@@ -69,8 +69,8 @@ namespace SharpReportCore{
 						retValue = item.DbValue;
 						break;
 				}
-			} catch (Exception e) {
-				throw e;
+			} catch (Exception) {
+				throw ;
 			}
 
 			return retValue;

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

@@ -21,6 +21,7 @@
 // Peter Forstmeier (Peter.Forstmeier@t-online.de)
 
 using System;
+using System.Globalization;
 using System.Data;
 using System.Drawing;
 using System.Drawing.Printing;
@@ -89,7 +90,7 @@ namespace SharpReportCore {
 			Rectangle detailRect;
 			
 			base.PrintBodyStart (sender,e);
-			base.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportDetail);
+			base.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportDetail,CultureInfo.InvariantCulture);
 			
 			BaseSection section = base.CurrentSection;
 			

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

@@ -16,20 +16,17 @@ using SharpReportCore;
 /// </remarks>
 	
 namespace SharpReportCore {
-	public delegate void ReportPageEventHandler (object sender,
-	                                             ReportPageEventArgs rpea);
 	
 	public class ReportDocument : PrintDocument {
 		
 		public event QueryPageSettingsEventHandler QueryPage;
 
-		public event ReportPageEventHandler ReportBegin;
-		
-		public event ReportPageEventHandler PrintPageBegin;
-		public event ReportPageEventHandler PrintPageBodyStart;
-		public event ReportPageEventHandler PrintPageBodyEnd;
-		public event ReportPageEventHandler PrintPageEnd;
-		public event ReportPageEventHandler ReportEnd;
+		public event EventHandler<ReportPageEventArgs> ReportBegin;
+		public event EventHandler<ReportPageEventArgs> PrintPageBegin;
+		public event EventHandler<ReportPageEventArgs> PrintPageBodyStart;
+		public event EventHandler<ReportPageEventArgs> PrintPageBodyEnd;
+		public event EventHandler<ReportPageEventArgs> PrintPageEnd;
+		public event EventHandler<ReportPageEventArgs> ReportEnd;
 		
 		
 		int pageNr;

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

@@ -34,7 +34,7 @@ namespace SharpReportCore {
 	using SharpReportCore;
 	
 	
-	public class ReportModel : object,SharpReportCore.IModel{
+	public class ReportModel : object,SharpReportCore.IModel,IDisposable{
 		
 		ReportSettings reportSettings;
 		ReportSectionCollection sectionCollection;
@@ -104,7 +104,14 @@ namespace SharpReportCore {
 			}
 		}
 		
+		// this Property is only a shortcut,,otherwise we have
+		// to use 'ReportModel.reportSettings.DataModel'
 		
+		public GlobalEnums.enmPushPullModel DataModel {
+			get {
+				return reportSettings.DataModel;
+			}
+		}
 		
 		public ReportSectionCollection SectionCollection {
 			get {
@@ -116,5 +123,13 @@ namespace SharpReportCore {
 		}
 		
 		#endregion
+		
+		#region IDispoable
+		public void Dispose(){
+			if (this.reportSettings != null) {
+				this.reportSettings.Dispose();
+			}
+		}
+		#endregion
 	}
 }

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

@@ -38,7 +38,8 @@ namespace SharpReportCore{
 	/// This class stores all the basic settings of an Report
 	/// </summary>
 	/// 
-	public class ReportSettings : BaseSettings,SharpReportCore.IStoreable,SharpReportCore.ISectionRenderer{
+	public class ReportSettings : BaseSettings,SharpReportCore.IStoreable,
+	SharpReportCore.ISectionRenderer,IDisposable{
 
 		private string connectionString;
 		private string commandText;
@@ -109,8 +110,8 @@ namespace SharpReportCore{
 						}
 					}
 				}
-			} catch (Exception e) {
-				throw e;
+			} catch (Exception ) {
+				throw ;
 			}
 		}
 		
@@ -499,7 +500,7 @@ namespace SharpReportCore{
 			set {
 				if (reportType != value) {
 					reportType = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}
@@ -544,7 +545,7 @@ namespace SharpReportCore{
 				}
 				if (groupingsCollection != value) {
 					groupingsCollection = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}
@@ -565,7 +566,7 @@ namespace SharpReportCore{
 				}
 				if (reportParametersCollection != value) {
 					reportParametersCollection = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}
@@ -582,7 +583,7 @@ namespace SharpReportCore{
 			set {
 				if (connectionString != value) {
 					connectionString = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}
@@ -597,7 +598,7 @@ namespace SharpReportCore{
 			set {
 				if (commandText != value) {
 					commandText = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}
@@ -611,7 +612,7 @@ namespace SharpReportCore{
 			set {
 				if (commandType != value) {
 					commandType = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}
@@ -625,7 +626,7 @@ namespace SharpReportCore{
 			set {
 				if (dataModel != value) {
 					dataModel = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}
@@ -645,7 +646,7 @@ namespace SharpReportCore{
 			set {
 				if (defaultFont != value) {
 					defaultFont = value;
-					this.FirePropertyChanged();
+					this.NotifyPropertyChanged();
 				}
 			}
 		}
@@ -667,5 +668,15 @@ namespace SharpReportCore{
 		}
 		 */
 		#endregion
+		
+		#region IDisposable
+		public void Dispose(){
+			if (this.defaultFont != null) {
+				this.defaultFont.Dispose();
+			}
+		}
+		
+		#endregion
+		
 	}
 }

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

@@ -36,14 +36,16 @@ using SharpReportCore;
 /// </remarks>
 
 namespace SharpReportCore {
-	public class SharpReportEngine : object {
+	public class SharpReportEngine : object,IDisposable {
 		
 		private PreviewControl previewControl = null;
 		
 		private ConnectionObject connectionObject = null;
 		
-		public event SharpReportEventHandler NoData;
-		public event SharpReportParametersEventHandler ParametersRequest;
+		public event EventHandler <SharpReportEventArgs> NoData;
+//		public event EventSharpReportEventHandler NoData;
+//		public event SharpReportParametersEventHandler ParametersRequest;
+		public event EventHandler <SharpReportParametersEventArgs> ParametersRequest;
 		
 		public SharpReportEngine() {
 			if (SharpReportCore.GlobalValues.IsValidPrinter() == false) {
@@ -116,7 +118,7 @@ namespace SharpReportCore {
 		
 		private void ApplyReportParameters (ReportModel model,ReportParameters parameters){
 			if ((model == null)||(parameters == null )){
-			    	throw new ArgumentNullException("SharpReportEngine:ApplyReportParameters");
+				throw new ArgumentNullException("SharpReportEngine:ApplyReportParameters");
 			}
 			
 			SetSqlParameters (model,parameters.SqlParameters);
@@ -193,11 +195,11 @@ namespace SharpReportCore {
 		protected SharpReportCore.AbstractRenderer SetupStandartRenderer (ReportModel model) {
 			AbstractRenderer abstr = null;
 			switch (model.ReportSettings.ReportType) {
-				//FormSheets reports
+					//FormSheets reports
 				case GlobalEnums.enmReportType.FormSheet:
 					abstr = new RendererFactory().Create (model,null);
 					break;
-				//Databased reports
+					//Databased reports
 				case GlobalEnums.enmReportType.DataReport :
 					DataManager dataManager = SetupDataContainer (model.ReportSettings);
 					if (dataManager != null) {
@@ -223,7 +225,7 @@ namespace SharpReportCore {
 						}
 					}
 					
-				 break;
+					break;
 				default:
 					throw new SharpReportException ("SharpReportmanager:SetupRenderer -> Unknown Reporttype");
 			}
@@ -282,7 +284,7 @@ namespace SharpReportCore {
 		/// this is an easy way to ask the report for desired paramaters</see></summary>
 		
 		public ReportParameters LoadParameters (string fileName) {
-				if (fileName.Length == 0) {
+			if (fileName.Length == 0) {
 				throw new ArgumentNullException("PreviewPushDataReport FileName");
 			}
 			ReportModel model = null;
@@ -325,14 +327,12 @@ namespace SharpReportCore {
 
 			ReportModel model = null;
 			AbstractRenderer renderer = null;
-			PrintDocument  doc = null;
 			try {
 				model = ModelFromFile (fileName);
 				if (CheckReportParameters (model,reportParameters)) {
 					renderer = SetupStandartRenderer (model);
-					if (renderer.Cancel == false) {
-						doc = renderer.ReportDocument;
-						PreviewControl.ShowPreviewWithDialog (renderer,1.5);
+					if (renderer != null) {
+						PreviewControl.ShowPreview(renderer,1.5,false);
 					}
 				}
 			} catch (Exception) {
@@ -354,7 +354,7 @@ namespace SharpReportCore {
 			}
 			ReportModel model = null;
 			AbstractRenderer renderer = null;
-			PrintDocument  doc = null;
+//			PrintDocument  doc = null;
 			try {
 				model = ModelFromFile (fileName);
 				
@@ -363,10 +363,13 @@ namespace SharpReportCore {
 				}
 				
 				renderer = SetupPushDataRenderer (model,dataTable);
-				if (renderer.Cancel == false) {
-					doc = renderer.ReportDocument;
-					PreviewControl.ShowPreviewWithDialog (renderer,1.5);
+				if (renderer != null) {
+					PreviewControl.ShowPreview(renderer,1.5,false);
 				}
+//				if (renderer.Cancel == false) {
+//					doc = renderer.ReportDocument;
+//					PreviewControl.ShowPreviewWithDialog (renderer,1.5);
+//				}
 			} catch (Exception) {
 				
 			}
@@ -441,7 +444,7 @@ namespace SharpReportCore {
 		
 		public void PrintPushDataReport (string fileName,
 		                                 DataTable dataTable,
-		                                bool showPrintDialog) {
+		                                 bool showPrintDialog) {
 			
 			if (fileName.Length == 0) {
 				throw new ArgumentException("PreviewPushDataReport fileName");
@@ -520,10 +523,8 @@ namespace SharpReportCore {
 				model.Accept (modelVisitor);
 				return model;
 			} catch (Exception) {
-				
+				throw;
 			}
-			return null;
-			
 		}
 
 		
@@ -554,5 +555,15 @@ namespace SharpReportCore {
 		}
 		
 		#endregion
+		#region IDisposable
+		public void Dispose(){
+			if (this.connectionObject == null) {
+				this.connectionObject.Dispose();
+			}
+			if (this.previewControl != null) {
+				this.previewControl.Dispose();
+			}
+		}
+		#endregion
 	}
 }

src/AddIns/Misc/SharpReport/SharpReportCore/Xml/XmlHelper.cs

@@ -17,7 +17,7 @@ using System.Windows.Forms;
 /// This class contains some basic methodes to handel Xml related stuff
 /// </summary>
 /// <remarks>
-/// 	created by - Forstmeier Helmut
+/// 	created by - Forstmeier Peter
 /// 	created on - 31.08.2005 17:14:18
 /// </remarks>
 /// 
@@ -48,8 +48,8 @@ namespace SharpReportCore {
 				if (elem.Name.Equals (SharpReportCore.GlobalValues.SharpReportString)) {
 			    	isOk = true;
 			 	}
-			} catch (Exception e) {
-				throw e;
+			} catch (Exception) {
+				throw ;
 			}
 			return isOk;
 		}