From 746f85b28a632011a246f1d4a25ffaae0beefb2f Mon Sep 17 00:00:00 2001
From: Peter Forstmeier <peter.forstmeier@t-online.de>
Date: Fri, 14 May 2010 17:56:29 +0000
Subject: [PATCH] Adujst test's

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@5824 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../ICSharpCode.Reports.Core.csproj           |  4 ++
 .../Project/Exporter/AbstractReportCreator.cs | 50 +++++++++++++++++
 .../Project/Exporter/DataReportCreator.cs     | 54 +++++++++++++++++++
 .../ICSharpCode.Reports.Core.Test.csproj      |  4 +-
 .../ExportItemsConverterFixture.cs            |  2 +-
 5 files changed, 111 insertions(+), 3 deletions(-)
 create mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractReportCreator.cs
 create mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataReportCreator.cs
 rename src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/{Exporter => old_Exporter}/ExportItemsConverterFixture.cs (98%)

diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
index 22eeae532e..dc137ef7c9 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
@@ -127,6 +127,8 @@
     <Compile Include="Project\Exceptions\UnknownItemException.cs" />
     <Compile Include="Project\Exceptions\WrongColumnException.cs" />
     <Compile Include="Project\Exceptions\WrongSectionException.cs" />
+    <Compile Include="Project\Exporter\AbstractReportCreator.cs" />
+    <Compile Include="Project\Exporter\DataReportCreator.cs" />
     <Compile Include="Project\old_Exporter\BasePager.cs" />
     <Compile Include="Project\old_Exporter\Converters\BaseConverter.cs" />
     <Compile Include="Project\old_Exporter\Converters\ConverterFactory.cs" />
@@ -352,6 +354,8 @@
     <Folder Include="Project\Dialogs" />
     <Folder Include="Project\Events" />
     <Folder Include="Project\Exceptions" />
+    <Folder Include="Project\Exporter" />
+    <Folder Include="Project\Converter" />
     <Folder Include="Project\old_Exporter\Converters" />
     <Folder Include="Project\Expressions\SimpleExpressionEvaluator" />
     <Folder Include="Project\Expressions\ReportingLanguage" />
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractReportCreator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractReportCreator.cs
new file mode 100644
index 0000000000..93e91289cf
--- /dev/null
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractReportCreator.cs
@@ -0,0 +1,50 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 14.05.2010
+ * Time: 19:48
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using ICSharpCode.Reports.Core.Interfaces;
+
+namespace ICSharpCode.Reports.Core.Project.Exporter
+{
+	/// <summary>
+	/// Description of BaseReportCreator.
+	/// </summary>
+	public class AbstractReportCreator:IReportCreator
+	{
+		public AbstractReportCreator(IReportModel reportModel)
+		{
+			if (reportModel == null) {
+				throw new ArgumentNullException("ReportModel");
+			}
+			
+			ReportModel = reportModel;
+		}
+		
+		
+		protected IReportModel ReportModel {get; private set;}
+		
+		#region IReportCreator
+		
+		public event EventHandler<ICSharpCode.Reports.Core.old_Exporter.PageCreatedEventArgs> PageCreated;
+		
+		public event EventHandler<SectionRenderEventArgs> SectionRendering;
+		
+		public PagesCollection Pages {
+			get {
+				throw new NotImplementedException();
+			}
+		}
+		
+		public void BuildExportList()
+		{
+			throw new NotImplementedException();
+		}
+		
+		#endregion
+	}
+}
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataReportCreator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataReportCreator.cs
new file mode 100644
index 0000000000..6d802a3295
--- /dev/null
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataReportCreator.cs
@@ -0,0 +1,54 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 13.05.2010
+ * Time: 19:58
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+using System.Drawing;
+using ICSharpCode.Reports.Core.Events;
+using ICSharpCode.Reports.Core.Interfaces;
+using ICSharpCode.Reports.Core.Project.Exporter;
+
+namespace ICSharpCode.Reports.Core.old_Exporter
+{
+	/// <summary>
+	/// Description of DataReportCreator.
+	/// </summary>
+	public class DataReportCreator:AbstractReportCreator
+	{
+		
+		
+		#region Constructor
+		
+		
+		public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager,ILayouter layouter)
+		{
+			if (reportModel == null) {
+				throw new ArgumentNullException("reportModel");
+			}
+			if (dataManager == null) {
+				throw new ArgumentNullException("dataManager");
+			}
+			if (layouter == null) {
+				throw new ArgumentNullException("layouter");
+			}
+			var instance = new DataReportCreator(reportModel,dataManager,layouter);
+			return instance;
+		}
+		
+		
+		private DataReportCreator (IReportModel reportModel,IDataManager dataManager,ILayouter layouter):base(reportModel) 
+		{
+//			this.dataManager = dataManager;
+		}
+		
+		#endregion
+		
+		
+		
+	}
+}
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ICSharpCode.Reports.Core.Test.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ICSharpCode.Reports.Core.Test.csproj
index 38e3a7a464..d4be3e296d 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ICSharpCode.Reports.Core.Test.csproj
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ICSharpCode.Reports.Core.Test.csproj
@@ -75,7 +75,7 @@
     <Compile Include="DataManager\IListDataManagerFixture.cs" />
     <Compile Include="DataManager\MockDataAccess.cs" />
     <Compile Include="DataManager\TableDataManagerFixture.cs" />
-    <Compile Include="Exporter\ExportItemsConverterFixture.cs" />
+    <Compile Include="old_Exporter\ExportItemsConverterFixture.cs" />
     <Compile Include="Printing\SectionBoundFixture.cs" />
     <Compile Include="Printing\Shapes\BaseLineFixture.cs" />
     <Compile Include="Printing\Shapes\EllipseShapeFixture.cs" />
@@ -119,7 +119,7 @@
     <Folder Include="DataManager" />
     <Folder Include="Collections" />
     <Folder Include="BaseClasses" />
-    <Folder Include="Exporter" />
+    <Folder Include="old_Exporter" />
     <Folder Include="Printing\Shapes" />
     <Folder Include="TestHelpers" />
     <Folder Include="Printing" />
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/ExportItemsConverterFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/old_Exporter/ExportItemsConverterFixture.cs
similarity index 98%
rename from src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/ExportItemsConverterFixture.cs
rename to src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/old_Exporter/ExportItemsConverterFixture.cs
index 0c184bc31f..5cdad0253f 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/ExportItemsConverterFixture.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/old_Exporter/ExportItemsConverterFixture.cs
@@ -13,7 +13,7 @@ using ICSharpCode.Reports.Core.old_Exporter;
 using NUnit.Framework;
 using ICSharpCode.Reports.Core.Test.TestHelpers;
 
-namespace ICSharpCode.Reports.Core.Test.Exporter
+namespace ICSharpCode.Reports.Core.Test.old_Exporter
 {
 	[TestFixture]
 	public class ExportItemsConverterFixture:ConcernOf<ExportItemsConverter>