Cleanup

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/PageInfo.cs

@@ -8,13 +8,14 @@
  */
 using System;
 using System.Collections;
+using ICSharpCode.Reports.Core.Interfaces;
 
 namespace ICSharpCode.Reports.Core.BaseClasses
 {
 	/// <summary>
 	/// Description of PageInfo.
 	/// </summary>
-	public class PageInfo
+	public class PageInfo:IPageInfo
 	{
 
 		private Hashtable parameterHash;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs

@@ -239,7 +239,7 @@ public static ExportContainer ConvertToContainer (ISimpleContainer item,Point of
 
 		public static IExpressionEvaluatorFacade  SetupEvaluator ()
 		{
-			return new ExpressionEvaluatorFacade();
+			return new ExpressionEvaluatorFacade(null);
 		}
 
 
@@ -252,9 +252,8 @@ public static IExpressionEvaluatorFacade  CreateEvaluator (ISinglePage singlePag
 			if (dataNavigator == null) {
 				throw new ArgumentNullException("dataNavigator");
 			}
-			IExpressionEvaluatorFacade evaluatorFacade = new ExpressionEvaluatorFacade();
-			evaluatorFacade.SinglePage = singlePage;
-			evaluatorFacade.SinglePage.IDataNavigator = dataNavigator;
+			singlePage.IDataNavigator = dataNavigator;
+			IExpressionEvaluatorFacade evaluatorFacade = new ExpressionEvaluatorFacade(singlePage);
 			return evaluatorFacade;
 		}
 

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

@@ -201,13 +201,14 @@ protected void FinishRendering (IDataNavigator navigator)
 				p.TotalPages = this.Pages.Count;
 			}
 
-			IExpressionEvaluatorFacade evaluatorFacade = new ExpressionEvaluatorFacade();
+			this.singlePage.IDataNavigator = navigator;
+			IExpressionEvaluatorFacade evaluatorFacade = new ExpressionEvaluatorFacade(this.singlePage);
 
 			foreach (ExporterPage p in this.pages)
 			{
 				this.singlePage = p;
-				evaluatorFacade.SinglePage = this.singlePage;
-				evaluatorFacade.SinglePage.IDataNavigator = navigator;
+//				evaluatorFacade.SinglePage = this.singlePage;
+//				evaluatorFacade.SinglePage.IDataNavigator = navigator;
 				EvaluateRecursive(evaluatorFacade,p.Items);
 			}
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs

@@ -22,15 +22,17 @@ public class ExpressionEvaluatorFacade:IExpressionEvaluatorFacade
 	{
 		private ReportingLanguageCompiler compiler;
 		private ExpressionContext context;
-		private ISinglePage singlePage;
+		private IPageInfo singlePage;
 
 
-		public ExpressionEvaluatorFacade()
+		public ExpressionEvaluatorFacade(IPageInfo pageInfo)
 		{
 			compiler = new ReportingLanguageCompiler();
 			this.context = new ExpressionContext(null);
 			context.ResolveUnknownVariable += VariableStore;
 			context.ResolveMissingFunction += FunctionStore;
+			SinglePage = pageInfo;
+			compiler.SinglePage = pageInfo;
 		}
 
 
@@ -86,7 +88,7 @@ private void VariableStore (object sender,SimpleExpressionEvaluator.Evaluation.U
 		}
 
 
-		public ISinglePage SinglePage {
+		public IPageInfo SinglePage {
 			get { return singlePage; }
 			set {
 				singlePage = value;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/IExpressionEvaluatorFacade.cs

@@ -18,6 +18,6 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 	public interface IExpressionEvaluatorFacade
 	{
 		string Evaluate (string expression);
-		ISinglePage SinglePage {get;set;}
+		IPageInfo SinglePage {get;set;}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs

@@ -22,7 +22,7 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 	/// </summary>
 	public class ReportingLanguageCompiler:SimpleExpressionLanguageCompiler
 	{
-		private ISinglePage singlePage;
+		private IPageInfo singlePage;
 		private ReportingLanguage reportingLanguage;
 		private Compiler compiler;
 
@@ -304,7 +304,7 @@ protected  IExpression old_CompileExpressionNode(IExpressionNodeFactory factory,
 		}
 
 
-		public ISinglePage SinglePage {
+		public IPageInfo SinglePage {
 			get { return singlePage; }
 			set { singlePage = value; }
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/ExpressionEvaluatorFixture.cs

@@ -21,7 +21,7 @@ public class ExpressionEvaluatorFixture:ConcernOf<ExpressionEvaluatorFacade>
 		[Test]
 		public void Can_Init_ExpressionEvaluatorFassade()
 		{
-			IExpressionEvaluatorFacade f = new ExpressionEvaluatorFacade();
+			IExpressionEvaluatorFacade f = new ExpressionEvaluatorFacade(null);
 			Assert.IsNotNull (f);
 		}
 
@@ -46,7 +46,7 @@ public void SimpleEvaluation ()
 
 		public override void Setup()
 		{
-			Sut = new ExpressionEvaluatorFacade();
+			Sut = new ExpressionEvaluatorFacade(null);
 		}
 
 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs

@@ -146,9 +146,10 @@ public void Throw_On_UnknownField ()
 		[TestFixtureSetUp]
 		public void Init()
 		{
-			this.evaluator = new ExpressionEvaluatorFacade();
+
+
 			this.singlePage = TestHelper.CreateSinglePage();
-			this.evaluator.SinglePage = this.singlePage;
+			this.evaluator = new ExpressionEvaluatorFacade(this.singlePage);
 
 			AggregateFuctionHelper ah = new AggregateFuctionHelper();
 			this.testTable = ah.AggregateTable;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs

@@ -142,10 +142,9 @@ public void Throw_On_UnknownField ()
 		[TestFixtureSetUp]
 		public void Init()
 		{
-			this.evaluator = new ExpressionEvaluatorFacade();
-			this.singlePage = TestHelper.CreateSinglePage();
-			this.evaluator.SinglePage = this.singlePage;
 
+			this.singlePage = TestHelper.CreateSinglePage();
+			this.evaluator = new ExpressionEvaluatorFacade(this.singlePage);
 
 
 			AggregateFuctionHelper ah = new AggregateFuctionHelper();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs

@@ -83,10 +83,9 @@ public void ExtractFieldbyName ()
 		[TestFixtureSetUp]
 		public void Init()
 		{
-			this.evaluator = new ExpressionEvaluatorFacade();
+
 			this.singlePage = TestHelper.CreateSinglePage();
-			this.evaluator.SinglePage = this.singlePage;
-
+			this.evaluator = new ExpressionEvaluatorFacade(this.singlePage);
 			AggregateFuctionHelper ah = new AggregateFuctionHelper();
 			this.testTable = ah.AggregateTable;
 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs

@@ -45,8 +45,8 @@ public void Can_Concat_Simple_FieldReference()
 		[TestFixtureSetUp]
 		public void Init()
 		{
-			this.evaluator = new ExpressionEvaluatorFacade();
-			this.evaluator.SinglePage = TestHelper.CreateSinglePage();
+			this.evaluator = new ExpressionEvaluatorFacade(TestHelper.CreateSinglePage());
+//			this.evaluator.SinglePage = TestHelper.CreateSinglePage();
 		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs

@@ -114,8 +114,8 @@ public void Throw_On_UnknownFunction()
 		public void Init()
 		{
 			this.singlePage = TestHelper.CreateSinglePage();
-			this.evaluator = new ExpressionEvaluatorFacade();
-			this.evaluator.SinglePage = this.singlePage;
+			this.evaluator = new ExpressionEvaluatorFacade(this.singlePage);
+//			this.evaluator.SinglePage = this.singlePage;
 		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/SimpleCompilerFixture.cs

@@ -84,7 +84,7 @@ public void Can_Compile_Simple_String()
 		[SetUp]
 		public void Init()
 		{
-			this.evaluator = new ExpressionEvaluatorFacade();
+			this.evaluator = new ExpressionEvaluatorFacade(null);
 		}
 
 		#endregion