Cleanup

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

@@ -150,6 +150,7 @@
     <Compile Include="Project\Exceptions\WrongSectionException.cs" />
     <Compile Include="Project\Exporter\Converters\GroupedTableConverter.cs" />
     <Compile Include="Project\Exporter\ExportColumns\ExportGraphicContainer.cs" />
+    <Compile Include="Project\Exporter\ExportHelper.cs" />
     <Compile Include="Project\Expressions\EvaluationHelper.cs" />
     <Compile Include="Project\Expressions\SimpleExpressionEvaluator\Compilation\Functions\ReportingService\FieldReference.cs" />
     <Compile Include="Project\Exporter\BasePager.cs" />

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

@@ -30,17 +30,6 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 			}
 		}
 		
-		/*
-		public static void aaAdjustBackColor (ISimpleContainer container, Color defaultColor)
-		{
-			if (container.BackColor != defaultColor) {
-				foreach (var item in container.Items)
-				{
-					item.BackColor = defaultColor;
-				}
-			}
-		}
-		*/
 		
 		public static void FillBackground (Graphics  graphics,BaseStyleDecorator decorator)
 		{
@@ -78,29 +67,6 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 		/// <param name="item">Item to convert</param>
 		/// <returns></returns>
 		
-		public static BaseExportColumn ConvertLineItem (BaseReportItem item,Point offset)
-		{
-			if (item == null) {
-				throw new ArgumentNullException("item");
-			}
-
-			IExportColumnBuilder columnBuilder = item as IExportColumnBuilder;
-			BaseExportColumn lineItem = null;
-			
-			
-			if (columnBuilder != null) {
-				lineItem = columnBuilder.CreateExportColumn();
-							                                              
-				lineItem.StyleDecorator.Location = new Point(offset.X + lineItem.StyleDecorator.Location.X,
-				                                             lineItem.StyleDecorator.Location.Y + offset.Y);
-				
-				lineItem.StyleDecorator.DisplayRectangle = new Rectangle(lineItem.StyleDecorator.Location,
-				                                                         lineItem.StyleDecorator.Size);
-			} 
-			return lineItem;
-		}
-		
-		
 		
 		private static void RenderLineItem (BaseReportItem item, Point offset,IExpressionEvaluatorFacade evaluator,ReportPageEventArgs rpea)
 		{
@@ -158,28 +124,10 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 		}
 		
 		
-		public static  ExporterCollection ConvertPlainCollection (ReportItemCollection items,Point offset)
-		{
-			if (items == null) {
-				throw new ArgumentNullException("items");
-			}
-			ExporterCollection col = new ExporterCollection();
-			if (items.Count > 0) {
-				
-				foreach(BaseReportItem item in items)
-				{
-					col.Add(StandardPrinter.ConvertLineItem(item,offset));
-				}
-			}
-			return col;
-		}
-		
 		#endregion
 	
 		
-		#region Container
-		
-		
+
 		public static Rectangle RenderContainer (ISimpleContainer simpleContainer,IExpressionEvaluatorFacade evaluator,Point offset,ReportPageEventArgs rpea)
 		{
 			
@@ -201,34 +149,6 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 			item.Location = saveLocation;
 			return retVal;
 		}
-		
-		
-		public static ExportContainer ConvertToContainer (ISimpleContainer container,Point offset) 
-		{
-			if (container == null) {
-				throw new ArgumentNullException("item");
-			}
-			
-			PrintHelper.AdjustParent(container,container.Items);
-			IExportColumnBuilder lineBuilder = container as IExportColumnBuilder;
-	
-			if (lineBuilder != null) {
-				ExportContainer lineItem = (ExportContainer)lineBuilder.CreateExportColumn();
-				
-				lineItem.StyleDecorator.Location = new Point (offset.X + lineItem.StyleDecorator.Location.X,
-				                                              offset.Y);
-				
-				lineItem.StyleDecorator.DisplayRectangle = new Rectangle(lineItem.StyleDecorator.Location,
-				                                                         lineItem.StyleDecorator.Size);
-				
-				AdjustBackColor (container);
-				return lineItem;
-			}
-			
-			return null;
-		}
-		
-		#endregion
 
 	}
 }

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

@@ -7,6 +7,7 @@ using ICSharpCode.Reports.Core.BaseClasses;
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.Globals;
 using ICSharpCode.Reports.Core.Interfaces;
+using ICSharpCode.Reports.Core.Project.Exporter;
 using ICSharpCode.Reports.Expressions.ReportingLanguage;
 
 namespace ICSharpCode.Reports.Core.Exporter
@@ -112,9 +113,9 @@ namespace ICSharpCode.Reports.Core.Exporter
 						var layouter = (ILayouter)ServiceContainer.GetService(typeof(ILayouter));
 						LayoutHelper.SetLayoutForRow(Graphics,layouter, simpleContainer);
 						
-						ExportContainer exportContainer = StandardPrinter.ConvertToContainer(simpleContainer,Offset);
+						ExportContainer exportContainer = ExportHelper.ConvertToContainer(simpleContainer,Offset);
 						
-						ExporterCollection exporterCollection = StandardPrinter.ConvertPlainCollection(simpleContainer.Items,exportContainer.StyleDecorator.Location);
+						ExporterCollection exporterCollection = ExportHelper.ConvertPlainCollection(simpleContainer.Items,exportContainer.StyleDecorator.Location);
 						exportContainer.Items.AddRange(exporterCollection);
 						convertedSection.Add(exportContainer);
 						Offset = new Point(Offset.X,Offset.Y + exportContainer.StyleDecorator.Size.Height + GlobalValues.GapBetweenContainer);
@@ -122,7 +123,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 					}
 					else
 					{
-						var converteditem = StandardPrinter.ConvertLineItem(item,Offset);
+						var converteditem = ExportHelper.ConvertLineItem(item,Offset);
 							Offset = new Point(Offset.X,Offset.Y + converteditem.StyleDecorator.Size.Height + GlobalValues.GapBetweenContainer);
 						convertedSection.Add(converteditem);
 					}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs

@@ -11,6 +11,7 @@ using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.Events;
 using ICSharpCode.Reports.Core.Globals;
 using ICSharpCode.Reports.Core.Interfaces;
+using ICSharpCode.Reports.Core.Project.Exporter;
 using ICSharpCode.Reports.Expressions.ReportingLanguage;
 
 namespace ICSharpCode.Reports.Core.Exporter
@@ -116,8 +117,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 			IExportColumnBuilder exportLineBuilder = row as IExportColumnBuilder;
 
 			if (exportLineBuilder != null) {
-				ExportContainer exportContainer = StandardPrinter.ConvertToContainer(row,offset);
-				ExporterCollection list = StandardPrinter.ConvertPlainCollection(row.Items,exportContainer.StyleDecorator.Location);
+				ExportContainer exportContainer = ExportHelper.ConvertToContainer(row,offset);
+				ExporterCollection list = ExportHelper.ConvertPlainCollection(row.Items,exportContainer.StyleDecorator.Location);
 				exportContainer.Items.AddRange(list);
 				ExporterCollection containerList = new ExporterCollection();
 				containerList.Add (exportContainer);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs

@@ -6,6 +6,7 @@ using System.Drawing;
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.Globals;
 using ICSharpCode.Reports.Core.Interfaces;
+using ICSharpCode.Reports.Core.Project.Exporter;
 using ICSharpCode.Reports.Expressions.ReportingLanguage;
 
 namespace ICSharpCode.Reports.Core.Exporter
@@ -174,7 +175,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 				groupCollection = section.Items.ExtractGroupedColumns();
 				base.DataNavigator.Fill(groupCollection);
 				base.FireSectionRendering(section);
-				ExporterCollection list = StandardPrinter.ConvertPlainCollection(groupCollection,offset);
+				ExporterCollection list = ExportHelper.ConvertPlainCollection(groupCollection,offset);
 				
 				EvaluationHelper.EvaluateRow(base.Evaluator,list);
 				

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs

@@ -9,6 +9,7 @@ using System.Linq;
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.Globals;
 using ICSharpCode.Reports.Core.Interfaces;
+using ICSharpCode.Reports.Core.Project.Exporter;
 using ICSharpCode.Reports.Expressions.ReportingLanguage;
 
 namespace ICSharpCode.Reports.Core.Exporter
@@ -201,7 +202,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 				base.DataNavigator.Fill(groupCollection);
 				base.FireSectionRendering(section);
 				
-				ExporterCollection list = StandardPrinter.ConvertPlainCollection(groupCollection,offset);
+				ExporterCollection list = ExportHelper.ConvertPlainCollection(groupCollection,offset);
 				EvaluationHelper.EvaluateRow(base.Evaluator,list);
 				
 				exportList.AddRange(list);

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

@@ -0,0 +1,88 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 26.03.2011
+ * Time: 18:03
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Drawing;
+using ICSharpCode.Reports.Core.BaseClasses.Printing;
+using ICSharpCode.Reports.Core.Exporter;
+using ICSharpCode.Reports.Core.Interfaces;
+
+namespace ICSharpCode.Reports.Core.Project.Exporter
+{
+	/// <summary>
+	/// Description of ExportHelper.
+	/// </summary>
+	internal static class ExportHelper
+	{
+		
+		public static BaseExportColumn ConvertLineItem (BaseReportItem item,Point offset)
+		{
+			if (item == null) {
+				throw new ArgumentNullException("item");
+			}
+
+			IExportColumnBuilder columnBuilder = item as IExportColumnBuilder;
+			BaseExportColumn lineItem = null;
+			
+			
+			if (columnBuilder != null) {
+				lineItem = columnBuilder.CreateExportColumn();
+							                                              
+				lineItem.StyleDecorator.Location = new Point(offset.X + lineItem.StyleDecorator.Location.X,
+				                                             lineItem.StyleDecorator.Location.Y + offset.Y);
+				
+				lineItem.StyleDecorator.DisplayRectangle = new Rectangle(lineItem.StyleDecorator.Location,
+				                                                         lineItem.StyleDecorator.Size);
+			} 
+			return lineItem;
+		}
+		
+		
+		public static  ExporterCollection ConvertPlainCollection (ReportItemCollection items,Point offset)
+		{
+			if (items == null) {
+				throw new ArgumentNullException("items");
+			}
+			ExporterCollection col = new ExporterCollection();
+			if (items.Count > 0) {
+				
+				foreach(BaseReportItem item in items)
+				{
+					col.Add(ExportHelper.ConvertLineItem(item,offset));
+				}
+			}
+			return col;
+		}
+		
+		
+		public static ExportContainer ConvertToContainer (ISimpleContainer container,Point offset) 
+		{
+			if (container == null) {
+				throw new ArgumentNullException("item");
+			}
+			
+			PrintHelper.AdjustParent(container,container.Items);
+			IExportColumnBuilder lineBuilder = container as IExportColumnBuilder;
+	
+			if (lineBuilder != null) {
+				ExportContainer lineItem = (ExportContainer)lineBuilder.CreateExportColumn();
+				
+				lineItem.StyleDecorator.Location = new Point (offset.X + lineItem.StyleDecorator.Location.X,
+				                                              offset.Y);
+				
+				lineItem.StyleDecorator.DisplayRectangle = new Rectangle(lineItem.StyleDecorator.Location,
+				                                                         lineItem.StyleDecorator.Size);
+				
+				StandardPrinter.AdjustBackColor (container);
+				return lineItem;
+			}
+			
+			return null;
+		}
+	}
+}