Cleanup

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);
 	}
 }

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("<Page> {0} - {1}  Items {2}",
 			                 page.Name,page.Location,page.BackColor);
 			foreach (var element in page.ExportedItems) {
-				var ac = element as IAcceptor;
+				var acceptor = element as IAcceptor;
-				ac.Accept(this);
+				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;
+				var acceptor = element as IAcceptor;
-				ac.Accept(this);
+				acceptor.Accept(this);
 			}
 		}
 		

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<ExportText> {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}",
+			var result = evaluator.Evaluate("2 * 10");
-			                  exportColumn.Name,exportColumn.Location,exportColumn.BackColor);
+			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);
+			
 		}
 	}
 }

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);
 	}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/WpfVisitor.cs

@@ -18,7 +18,7 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
 	/// <summary>
 	/// Description of WpfVisitor.
 	/// </summary>
-	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;}
-		
 	}
 }

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);