From 170674ba2db6595423760a4f2518962ffbd9b77f Mon Sep 17 00:00:00 2001 From: peterforstmeier Date: Sun, 26 Sep 2010 20:23:07 +0200 Subject: [PATCH] Cleanup --- .../Project/BaseClasses/PageInfo.cs | 3 ++- .../Project/BaseClasses/Printing/StandardPrinter.cs | 7 +++---- .../Project/Exporter/BasePager.cs | 7 ++++--- .../Project/Expressions/ExpressionEvaluatorFacade.cs | 8 +++++--- .../Project/Expressions/IExpressionEvaluatorFacade.cs | 2 +- .../ReportingLanguage/ReportingLanguageCompiler.cs | 4 ++-- .../ReportingLanguage/ExpressionEvaluatorFixture.cs | 4 ++-- .../IntegrationTests/AggregateFunctionsFixture.cs | 5 +++-- .../AggregateFunctionsFromIListFixture.cs | 5 ++--- .../IntegrationTests/ConcatFieldsFixture.cs | 5 ++--- .../IntegrationTests/FieldReferenceFixture.cs | 4 ++-- .../ReportingLanguage/IntegrationTests/GlobalFunctions.cs | 4 ++-- .../IntegrationTests/SimpleCompilerFixture.cs | 2 +- 13 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/PageInfo.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/PageInfo.cs index b4a5280aad..b38cdcbb55 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/PageInfo.cs +++ b/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 { /// /// Description of PageInfo. /// - public class PageInfo + public class PageInfo:IPageInfo { private Hashtable parameterHash; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs index e07eb1f63f..8afdc1689e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs @@ -239,7 +239,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing public static IExpressionEvaluatorFacade SetupEvaluator () { - return new ExpressionEvaluatorFacade(); + return new ExpressionEvaluatorFacade(null); } @@ -252,9 +252,8 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing 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; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs index 1f6d140dc5..b5d3f7284f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs @@ -201,13 +201,14 @@ namespace ICSharpCode.Reports.Core.Exporter 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); } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs index 9c0eb1156e..e2468d49e3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs @@ -22,15 +22,17 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage { 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 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage } - public ISinglePage SinglePage { + public IPageInfo SinglePage { get { return singlePage; } set { singlePage = value; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/IExpressionEvaluatorFacade.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/IExpressionEvaluatorFacade.cs index d9280d722a..003936dfff 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/IExpressionEvaluatorFacade.cs +++ b/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;} } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs index d6144e603d..19b82ff21b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs @@ -22,7 +22,7 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage /// public class ReportingLanguageCompiler:SimpleExpressionLanguageCompiler { - private ISinglePage singlePage; + private IPageInfo singlePage; private ReportingLanguage reportingLanguage; private Compiler compiler; @@ -304,7 +304,7 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage } - public ISinglePage SinglePage { + public IPageInfo SinglePage { get { return singlePage; } set { singlePage = value; } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/ExpressionEvaluatorFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/ExpressionEvaluatorFixture.cs index fed9f676e5..367051a49f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/ExpressionEvaluatorFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/ExpressionEvaluatorFixture.cs @@ -21,7 +21,7 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage [Test] public void Can_Init_ExpressionEvaluatorFassade() { - IExpressionEvaluatorFacade f = new ExpressionEvaluatorFacade(); + IExpressionEvaluatorFacade f = new ExpressionEvaluatorFacade(null); Assert.IsNotNull (f); } @@ -46,7 +46,7 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage public override void Setup() { - Sut = new ExpressionEvaluatorFacade(); + Sut = new ExpressionEvaluatorFacade(null); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs index b32c2b9c2f..adc778457b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs @@ -146,9 +146,10 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests [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; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs index 23bf19f4ab..9d40bb7c7d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs @@ -142,10 +142,9 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests [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(); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs index fb9ec1560f..60150ce86a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs @@ -83,10 +83,9 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests [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; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs index 76f6450874..11b73abb8e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs @@ -45,8 +45,8 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests [TestFixtureSetUp] public void Init() { - this.evaluator = new ExpressionEvaluatorFacade(); - this.evaluator.SinglePage = TestHelper.CreateSinglePage(); + this.evaluator = new ExpressionEvaluatorFacade(TestHelper.CreateSinglePage()); +// this.evaluator.SinglePage = TestHelper.CreateSinglePage(); } } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs index f73ca42081..f8219b6b4e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs @@ -114,8 +114,8 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests 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; } } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/SimpleCompilerFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/SimpleCompilerFixture.cs index b674761642..1fb822dedb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/SimpleCompilerFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/SimpleCompilerFixture.cs @@ -84,7 +84,7 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage [SetUp] public void Init() { - this.evaluator = new ExpressionEvaluatorFacade(); + this.evaluator = new ExpressionEvaluatorFacade(null); } #endregion