Remove TestWPFReportPreview from Designer

Author: PeterForstmeier

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/ExpressionRunner.cs

@@ -48,7 +48,7 @@ public ExpressionRunner(Collection<ExportPage> pages,ReportSettings reportSettin
 
 		public  void Run()
 		{
-			Visitor = new ExpressionVisitor (reportSettings);
+//			Visitor = new ExpressionVisitor (reportSettings);
 			if (dataSource != null) {
 				if (dataSource.SortedList != null) {
 					Visitor.SetCurrentDataSource(dataSource.SortedList);

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/FormPageBuilder.cs

@@ -18,8 +18,6 @@
 
 using System;
 using System.Linq;
-using ICSharpCode.Reporting.Exporter;
-using ICSharpCode.Reporting.Expressions;
 using ICSharpCode.Reporting.Interfaces;
 
 namespace ICSharpCode.Reporting.PageBuilder

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs

@@ -56,13 +56,22 @@ public IReportCreator ReportCreator (Stream stream,Type listType,IEnumerable lis
 		public IReportCreator ReportCreator (Stream stream)
 		{
 			ReportModel = LoadReportModel (stream);
-			IReportCreator builder = null;
+//			IReportCreator builder = null;
 //			builder = ReportCreatorFactory.ExporterFactory(ReportModel);
-			builder = new FormPageBuilder(ReportModel);
+			var builder = new FormPageBuilder(ReportModel);
 			return builder;
 		}
 
 
+		public IReportCreator ReportCreator (ReportModel reportModel) {
+			ReportModel = reportModel;
+//			IReportCreator builder = null;
+//			builder = ReportCreatorFactory.ExporterFactory(ReportModel);
+			var builder = new FormPageBuilder(ReportModel);
+			return builder;
+		}
+		
+		
 		internal ReportModel LoadReportModel (Stream stream)
 		{
 			var doc = new XmlDocument();

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

@@ -342,7 +342,6 @@
     <ProjectReference Include="..\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj">
       <Project>{4B2239FF-8FD6-431D-9D22-1B8049BA6917}</Project>
       <Name>ICSharpCode.Reports.Core</Name>
-      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

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

@@ -64,7 +64,7 @@ public class ReportDesignerView : AbstractViewContent, IHasPropertyContainer,
 		XmlView xmlView;
 		ReportPreview reportPreview;
 		ReportViewerSecondaryView reportViewer;
-		TestWPFReportPreview testView;
+//		TestWPFReportPreview testView;
 
 		#region Constructor
 
@@ -115,8 +115,8 @@ private void SetupSecondaryView ()
 			var wpfViewer = new WPFReportPreview(loader,this);
 			SecondaryViewContents.Add(wpfViewer);
 
-			testView = new TestWPFReportPreview(loader,this);
-			SecondaryViewContents.Add(testView);
+//			testView = new TestWPFReportPreview(loader,this);
+//			SecondaryViewContents.Add(testView);
 
 		}
 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/SecondaryViews/TestView/TestWPFReportPreview.cs

@@ -21,38 +21,24 @@
 using System.Xml;
 
 using ICSharpCode.Reporting;
-using ICSharpCode.Reporting.BaseClasses;
-using ICSharpCode.Reporting.Exporter;
-using ICSharpCode.Reporting.Globals;
 using ICSharpCode.Reporting.Interfaces;
-using ICSharpCode.Reporting.Interfaces.Export;
 using ICSharpCode.Reporting.Items;
 using ICSharpCode.Reporting.PageBuilder.ExportColumns;
 using ICSharpCode.Reporting.WpfReportViewer;
 using ICSharpCode.Reporting.Xml;
 using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
 using ICSharpCode.SharpDevelop.Workbench;
 
-//using ICSharpCode.Reports.Addin.Commands;
-//using ICSharpCode.Reports.Core;
-//using ICSharpCode.Reports.Core.Exporter.ExportRenderer;
-//using ICSharpCode.Reports.Core.Globals;
-//using ICSharpCode.Reports.Core.WpfReportViewer;
-
-
-
-
 namespace ICSharpCode.Reports.Addin.SecondaryViews
 {
 	/// <summary>
 	/// Description of WPFReportPreview.
 	/// </summary>
 	public class TestWPFReportPreview: AbstractSecondaryViewContent
 	{
-		ReportDesignerLoader designerLoader;
+		readonly ReportDesignerLoader designerLoader;
 
-		ICSharpCode.Reporting.WpfReportViewer.IWpfReportViewer viewer;
+		IWpfReportViewer viewer;
 
 //		IExportRunner exportRunner = new ExportRunner();
 
@@ -70,13 +56,17 @@ public TestWPFReportPreview(ReportDesignerLoader loader,IViewContent content):ba
 
 		protected override void LoadFromPrimary()
 		{
-//			throw new NotImplementedException();
 			Pages.Clear();
 			var xmDoc = designerLoader.CreateXmlModel();
 			var modulLoader = new ModelLoader();
-			ReportModel model = (ReportModel)modulLoader.Load(xmDoc.DocumentElement);
+			var reportModel = (ReportModel)modulLoader.Load(xmDoc.DocumentElement);
 
 			var reportingFactory = new ReportingFactory();
+			var reportCreator = reportingFactory.ReportCreator(reportModel);
+			var previewViewModel = new PreviewViewModel (reportModel.ReportSettings,reportCreator.Pages);
+	reportCreator.BuildExportList();		
+			var p = new PreviewViewModel (reportModel.ReportSettings,reportCreator.Pages);
+			viewer.SetBinding(previewViewModel);
 			//Missing
 //			var reportCreator = reportingFactory.ReportCreator(model);
 //			if (reportCreator == null){