Cleanup

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs

@@ -570,29 +570,26 @@ namespace ICSharpCode.Reports.Addin
 			get {
 				ReportModel model = loader.CreateRenderableModel();
 				IReportCreator reportCreator = null;
-				Layouter layouter = new Layouter();
+				var  paramCmd = new CollectParametersCommand(model);
-				var  c = new CollectParametersCommand(model);
+				paramCmd.Run();
-			c.Run();
 				switch (model.DataModel) {
 						case GlobalEnums.PushPullModel.FormSheet :
 						{
-							reportCreator = FormPageBuilder.CreateInstance(model,layouter);
+							reportCreator = FormPageBuilder.CreateInstance(model);
 							break;
 						}
 						case GlobalEnums.PushPullModel.PullData:
 						{
-							
 							IDataManager dataManager = DataManagerFactory.CreateDataManager(model,(ReportParameters)null);
-							reportCreator = DataPageBuilder.CreateInstance(model,dataManager,layouter);
+							reportCreator = DataPageBuilder.CreateInstance(model,dataManager);
 							break;
 						}
 						case GlobalEnums.PushPullModel.PushData:{
-							ICSharpCode.Reports.Addin.Commands.DataSetFromXsdCommand cmd =
+							var cmd = new ICSharpCode.Reports.Addin.Commands.DataSetFromXsdCommand();
-								new ICSharpCode.Reports.Addin.Commands.DataSetFromXsdCommand();
 							cmd.Run();
 							DataSet ds = cmd.DataSet;
 							IDataManager dataManager = DataManagerFactory.CreateDataManager(model,ds.Tables[0]);
-							reportCreator = DataPageBuilder.CreateInstance(model,dataManager,layouter);
+							reportCreator = DataPageBuilder.CreateInstance(model,dataManager);
 							break;
 						}
 					default:

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj

@@ -252,7 +252,6 @@
     <Compile Include="Project\Globals\UnitConverter.cs" />
     <Compile Include="Project\Interfaces\IDataAccessStrategy.cs" />
     <Compile Include="Project\Interfaces\IDataViewStrategy.cs" />
-    <Compile Include="Project\Interfaces\IHierarchyInterfaces.cs" />
     <Compile Include="Project\Interfaces\IItemConverter.cs" />
     <Compile Include="Project\Interfaces\ILayouter.cs" />
     <Compile Include="Project\Interfaces\IReportItem.cs" />

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs

@@ -143,7 +143,6 @@ namespace ICSharpCode.Reports.Core{
 		
 		protected override void RemoveItem(int index)
 		{
-			BaseReportItem item = this[index];
 			base.RemoveItem(index);
 		}
 	

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

@@ -130,7 +130,7 @@ namespace ICSharpCode.Reports.Core {
 		#endregion
 		
 		#region Debug Code
-		
+		/*
 		protected  static void ShowIndexList (IndexList list)
 		{
 			
@@ -151,7 +151,7 @@ namespace ICSharpCode.Reports.Core {
 				}
 			}
 		}
-		
+		*/
 		#endregion
 		
 		public  virtual void Reset()

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

@@ -27,16 +27,15 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		#region Constructor
 		
-		public BasePager(IReportModel reportModel,ILayouter layouter)
+		public BasePager(IReportModel reportModel)
 		{
 			if (reportModel == null) {
 				throw new ArgumentNullException("reportModel");
 			}
-			if (layouter == null) {
+		
-				throw new ArgumentNullException ("layouter");
-			}
 			this.ReportModel = reportModel;
-			this.Layouter = layouter;
+			//this.Layouter = layouter;
+			this.Layouter = new Layouter();
 			this.Graphics = CreateGraphicObject.FromSize(this.ReportModel.ReportSettings.PageSize);
 		}
 		
@@ -210,7 +209,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 				ExportText et = be as ExportText;
 				
 				if (et != null) {
-					if (et.Text.StartsWith("=")) {
+					if (et.Text.StartsWith("=",StringComparison.InvariantCulture)) {
 						et.Text = evaluatorFassade.Evaluate(et.Text);
 					}
 				}

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

@@ -19,8 +19,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		#region Constructor
 		
-		
+		public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager)
-		public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager,ILayouter layouter)
+//		public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager,ILayouter layouter)
 		{
 			if (reportModel == null) {
 				throw new ArgumentNullException("reportModel");
@@ -28,15 +28,12 @@ namespace ICSharpCode.Reports.Core.Exporter
 			if (dataManager == null) {
 				throw new ArgumentNullException("dataManager");
 			}
-			if (layouter == null) {
+			DataPageBuilder instance = new DataPageBuilder(reportModel,dataManager);
-				throw new ArgumentNullException("layouter");
-			}
-			DataPageBuilder instance = new DataPageBuilder(reportModel,dataManager,layouter);
 			return instance;
 		}
 		
 		
-		private DataPageBuilder (IReportModel reportModel,IDataManager dataManager,ILayouter layouter):base(reportModel,layouter) 
+		private DataPageBuilder (IReportModel reportModel,IDataManager dataManager):base(reportModel) 
 		{
 			this.dataManager = dataManager;
 		}

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

@@ -16,18 +16,17 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		#region Constructure
 		
-		public static FormPageBuilder CreateInstance(IReportModel reportModel,ILayouter layouter)
+		public static FormPageBuilder CreateInstance(IReportModel reportModel)
 		{
 			if (reportModel == null) {
 				throw new ArgumentNullException("reportModel");
 			}
-			
+			FormPageBuilder instance = new FormPageBuilder(reportModel);
-			FormPageBuilder instance = new FormPageBuilder(reportModel,layouter);
 			return instance;
 		}
 		
 		
-		private FormPageBuilder(IReportModel reportModel,ILayouter layouter):base(reportModel,layouter)
+		private FormPageBuilder(IReportModel reportModel):base(reportModel)
 		{
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs

@@ -1,30 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-//ToDo with NET2.0 change this Interface to the one provided by NET2.0
-using System;
-
-namespace ICSharpCode.Reports.Core {
-	
-	public interface IHierarchyData{
-		
-		IndexList GetChildren {
-			get;
-		}
-
-		bool HasChildren {
-			get;
-		}
-		
-		object Item {
-			get;
-		}
-		string Path {
-			get;
-		}
-		
-		string Type {
-			get;
-		}
-	}
-}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs

@@ -469,13 +469,12 @@ namespace ICSharpCode.Reports.Core {
 			
 			IReportModel reportModel = LoadReportModel (fileName);
 			IReportCreator builder = null;
-			Layouter layouter = new Layouter();
 			if (reportModel.DataModel == GlobalEnums.PushPullModel.FormSheet) {
-				builder = FormPageBuilder.CreateInstance(reportModel,layouter);
+				builder = FormPageBuilder.CreateInstance(reportModel);
 			} else {
 				CheckForParameters(reportModel,reportParameters);
 				IDataManager dataMan  = DataManagerFactory.CreateDataManager(reportModel,reportParameters);
-				builder = DataPageBuilder.CreateInstance(reportModel, dataMan,layouter);
+				builder = DataPageBuilder.CreateInstance(reportModel, dataMan);
 			}
 			return builder;
 		}
@@ -493,8 +492,7 @@ namespace ICSharpCode.Reports.Core {
 				throw new ArgumentNullException("reportModel");
 			}
 			IDataManager dataMan  = DataManagerFactory.CreateDataManager(reportModel,(ReportParameters)null);
-			Layouter layouter = new Layouter();
+			IReportCreator builder = DataPageBuilder.CreateInstance(reportModel, dataMan);
-			IReportCreator builder = DataPageBuilder.CreateInstance(reportModel, dataMan,layouter);
 			return builder;
 		}
 		
@@ -543,8 +541,7 @@ namespace ICSharpCode.Reports.Core {
 			IDataManager dataMan  = DataManager.CreateInstance(dataTable,reportModel.ReportSettings);
 			if (dataMan != null)
 			{
-				Layouter layouter = new Layouter();
+				return DataPageBuilder.CreateInstance(reportModel, dataMan);
-				return DataPageBuilder.CreateInstance(reportModel, dataMan,layouter);
 			} else {
 				throw new MissingDataManagerException();
 			}
@@ -571,8 +568,7 @@ namespace ICSharpCode.Reports.Core {
 			ReportEngine.CheckForParameters(reportModel,reportParameters);
 			IDataManager dataMan  = DataManager.CreateInstance(list,reportModel.ReportSettings);
 			if (dataMan != null) {
-				Layouter layouter = new Layouter();
+				return DataPageBuilder.CreateInstance(reportModel,dataMan);
-				return DataPageBuilder.CreateInstance(reportModel,dataMan,layouter);
 			} else {
 				throw new MissingDataManagerException();
 			}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

@@ -151,9 +151,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 		
 		private void RunFormSheet (ReportModel reportModel)
 		{
-			
+			IReportCreator reportCreator = FormPageBuilder.CreateInstance(reportModel);
-			Layouter layouter = new Layouter();
-			IReportCreator reportCreator = FormPageBuilder.CreateInstance(reportModel,layouter);
 			reportCreator.SectionRendering += new EventHandler<SectionRenderEventArgs>(PushPrinting);
 			reportCreator.PageCreated += OnPageCreated;
 			reportCreator.BuildExportList();
@@ -163,8 +161,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 		
 		private void RunDataReport (ReportModel reportModel,IDataManager data)
 		{
-			ILayouter layouter = new Layouter();
+			IReportCreator reportCreator = DataPageBuilder.CreateInstance(reportModel,data);
-			IReportCreator reportCreator = DataPageBuilder.CreateInstance(reportModel,data,layouter);
 			reportCreator.SectionRendering += new EventHandler<SectionRenderEventArgs>(PushPrinting);
 			reportCreator.GroupHeaderRendering += new EventHandler<GroupHeaderEventArgs>(GroupHeaderRendering);
 			reportCreator.GroupFooterRendering += GroupFooterRendering;
@@ -195,7 +192,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 		
 		private void PushPrinting (object sender,SectionRenderEventArgs e)
 		{
-			string sectionName = e.Section.Name;
+//			string sectionName = e.Section.Name;
 			/*
 			if (sectionName == ReportSectionNames.ReportHeader) {
 				Console.WriteLine("PushPrinting  :" + ReportSectionNames.ReportHeader);