From e605a034d4ce37a73f2654eec74471ea89c809c8 Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Tue, 24 Sep 2013 20:11:05 +0200 Subject: [PATCH] Cleanup --- .../Src/Exporter/Visitors/AbstractVisitor.cs | 1 - .../Src/Exporter/Visitors/DebugVisitor.cs | 17 ++++--------- .../Exporter/Visitors/ExpressionVisitor.cs | 24 +++++++------------ .../Src/Exporter/Visitors/IVisitor.cs | 1 - .../Src/Exporter/Visitors/WpfVisitor.cs | 8 +------ .../Src/Exporter/WpfExporter.cs | 2 +- 6 files changed, 16 insertions(+), 37 deletions(-) diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs index 47f99faa0d..0d310b36ec 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs @@ -19,6 +19,5 @@ namespace ICSharpCode.Reporting.Exporter.Visitors public abstract void Visit(ExportPage page); public abstract void Visit(ExportContainer exportColumn); public abstract void Visit(ExportText exportColumn); - public abstract void Visit(ExportColumn exportColumn); } } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/DebugVisitor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/DebugVisitor.cs index e9cd9e9e78..ca6b3c4715 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/DebugVisitor.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/DebugVisitor.cs @@ -19,33 +19,26 @@ namespace ICSharpCode.Reporting.Exporter.Visitors class DebugVisitor : AbstractVisitor { - - public override void Visit(ExportPage page) { + Console.WriteLine(); Console.WriteLine(" {0} - {1} Items {2}", page.Name,page.Location,page.BackColor); foreach (var element in page.ExportedItems) { - var ac = element as IAcceptor; - ac.Accept(this); + var acceptor = element as IAcceptor; + acceptor.Accept(this); } } - public override void Visit(ExportColumn exportColumn) - { - Console.WriteLine("Visit ExportColumn {0} - {1} - {2}", exportColumn.Name,exportColumn.Size,exportColumn.Location); - } - - public override void Visit(ExportContainer exportColumn) { Console.WriteLine(); Console.WriteLine("\t{0} - {1} Items {2}", exportColumn.Name,exportColumn.Location,exportColumn.BackColor); foreach (var element in exportColumn.ExportedItems) { - var ac = element as IAcceptor; - ac.Accept(this); + var acceptor = element as IAcceptor; + acceptor.Accept(this); } } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/ExpressionVisitor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/ExpressionVisitor.cs index 15eaba993b..3c6745f1b6 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/ExpressionVisitor.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/ExpressionVisitor.cs @@ -23,43 +23,37 @@ namespace ICSharpCode.Reporting.Exporter.Visitors evaluator = new ExpressionEvaluator(grammar); } - public override void Visit(ICSharpCode.Reporting.PageBuilder.ExportColumns.ExportColumn exportColumn) - { - Console.WriteLine("Visit Page "); - - } public override void Visit(ICSharpCode.Reporting.PageBuilder.ExportColumns.ExportText exportColumn) { - Console.WriteLine("\t\t {0} - {1}", exportColumn.Text,exportColumn.Location); var result = evaluator.Evaluate("2 + 3"); - Console.WriteLine("ExpressionVisitor <{0}> - {1}",exportColumn.Name,result); + Console.WriteLine("\t\tExpressionVisitor <{0}> - {1}",exportColumn.Name,result); } public override void Visit(ICSharpCode.Reporting.PageBuilder.ExportColumns.ExportContainer exportColumn) { - Console.WriteLine("\t{0} - {1} Items {2}", - exportColumn.Name,exportColumn.Location,exportColumn.BackColor); + var result = evaluator.Evaluate("2 * 10"); + Console.WriteLine("\tExpressionVisitor <{0}> - {1}",exportColumn.Name,result); +// Console.WriteLine("\t{0} - {1} Items {2}", +// exportColumn.Name,exportColumn.Location,exportColumn.BackColor); foreach (var element in exportColumn.ExportedItems) { var ac = element as IAcceptor; ac.Accept(this); } - var result = evaluator.Evaluate("2 * 10"); - Console.WriteLine("ExpressionVisitor <{0}> - {1}",exportColumn.Name,result); - - } public override void Visit(ICSharpCode.Reporting.PageBuilder.ExportColumns.ExportPage page) { + var result = evaluator.Evaluate("5 * 10"); + Console.WriteLine("ExpressionVisitor page <{0}> {1}",page.PageInfo.PageNumber,result); foreach (var element in page.ExportedItems) { var ac = element as IAcceptor; ac.Accept(this); } - var result = evaluator.Evaluate("5 * 10"); + // Console.WriteLine("ExpressionVisitor <{0} - {1}>",exportColumn.Name,result); - Console.WriteLine("ExpressionVisitor page <{0}> {1}",page.PageInfo.PageNumber,result); + } } } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/IVisitor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/IVisitor.cs index 7b8de25efd..c07f962f01 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/IVisitor.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/IVisitor.cs @@ -14,7 +14,6 @@ namespace ICSharpCode.Reporting.Exporter.Visitors public interface IVisitor { void Visit(ExportPage page); - void Visit(ExportColumn exportColumn); void Visit(ExportContainer exportColumn); void Visit(ExportText exportColumn); } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/WpfVisitor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/WpfVisitor.cs index 882bc57e93..1d92225619 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/WpfVisitor.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/WpfVisitor.cs @@ -18,7 +18,7 @@ namespace ICSharpCode.Reporting.Exporter.Visitors /// /// Description of WpfVisitor. /// - internal class WpfVisitor: AbstractVisitor + class WpfVisitor: AbstractVisitor { private readonly FixedDocumentCreator documentCreator; @@ -50,12 +50,6 @@ namespace ICSharpCode.Reporting.Exporter.Visitors } - public override void Visit(ExportColumn exportColumn) - { -// Console.WriteLine("Wpf-Visit ExportColumn {0} - {1} - {2}", exportColumn.Name,exportColumn.Location,exportColumn.Size,); - } - public UIElement UIElement {get; private set;} - } } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs index 2643cc8bea..376edcd645 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs @@ -35,13 +35,13 @@ namespace ICSharpCode.Reporting.Exporter public override void Run () { Document = new FixedDocument(); - foreach (var page in Pages) { InternalRun(page); AddPageToDocument(Document,fixedPage); } } + void InternalRun(ExportPage page) { page.Accept(visitor);