cleanup

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@6277 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

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

@@ -28,7 +28,6 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 		
 		public static void AdjustBackColor (ISimpleContainer container)
 		{
-			
 			BaseReportItem parent = container as BaseReportItem;
 			if (parent.BackColor != GlobalValues.DefaultBackColor) {
 				foreach (BaseReportItem item in container.Items)
@@ -39,6 +38,18 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 		}
 		
 		
+		public static void AdjustBackColor (ISimpleContainer container, Color defaultColor)
+		{
+			BaseReportItem parent = container as BaseReportItem;
+			if (parent.BackColor != defaultColor) {
+				foreach (BaseReportItem item in container.Items)
+				{
+					item.BackColor = defaultColor;
+				}
+			}
+		}
+		
+		
 		public static void FillBackground (Graphics  graphics,BaseStyleDecorator decorator)
 		{
 			if (decorator.BackColor != GlobalValues.DefaultBackColor) {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs

@@ -75,6 +75,7 @@ namespace ICSharpCode.Reports.Core
 			}
 		}
 		
+		
 		public override bool MoveNext()
 		{
 			return base.MoveNext();

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

@@ -20,12 +20,12 @@ namespace ICSharpCode.Reports.Core.Exporter
 	/// </summary>
 	/// 
 	
-	public class old_RowConverter:BaseConverter
+	public class RowConverter:BaseConverter
 	{
 
 		private BaseReportItem parent;
 		
-		public old_RowConverter(IDataNavigator dataNavigator,
+		public RowConverter(IDataNavigator dataNavigator,
 		                    ExporterPage singlePage,
 		                    
 		                    ILayouter layouter):base(dataNavigator,singlePage,layouter)
@@ -52,7 +52,6 @@ namespace ICSharpCode.Reports.Core.Exporter
 				base.BaseConvert (myList,simpleContainer,parent.Location.X,
 				                  new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y));
 				
-				
 				return myList;
 			} else {
 				return this.ConvertDataRow(simpleContainer);
@@ -80,36 +79,38 @@ namespace ICSharpCode.Reports.Core.Exporter
 			
 				base.FillRow(simpleContainer);
 				
-				TestPrepareContainerForConverting(simpleContainer);
+				PrepareContainerForConverting(simpleContainer);
 
 				base.FireSectionRendering(section);
 
 				currentPosition = base.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
 				
-				TestAfterConverting (mylist,section);
+				AfterConverting (mylist,section);
-			// Grouping starts
+				
+			// Grouping starts  ------------------------
+			
 				if (base.DataNavigator.HasChildren) {
 					
-					((BaseReportItem)simpleContainer).BackColor = color;
+					//((BaseReportItem)simpleContainer).BackColor = color;
+					StandardPrinter.AdjustBackColor(simpleContainer,GlobalValues.DefaultBackColor);
 					base.DataNavigator.SwitchGroup();
 					do {
 						((BaseReportItem)simpleContainer).BackColor = color;
 
 						base.DataNavigator.FillChild(simpleContainer.Items);
-						TestPrepareContainerForConverting(simpleContainer);
+						PrepareContainerForConverting(simpleContainer);
 
 						base.FireSectionRendering(section);
 
 						currentPosition = base.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
 
-						TestAfterConverting (mylist,section);
+						AfterConverting (mylist,section);
 					}
 					while ( base.DataNavigator.ChildMoveNext());
-
 				}
 			
-				// end grouping
+				// end grouping -----------------
-		
+				
 				if (PrintHelper.IsPageFull(new Rectangle(new Point (simpleContainer.Location.X,currentPosition.Y), section.Size),base.SectionBounds)) {
 					base.FirePageFull(mylist);
 					section.SectionOffset = base.SinglePage.SectionBounds.PageHeaderRectangle.Location.Y;
@@ -130,13 +131,13 @@ namespace ICSharpCode.Reports.Core.Exporter
 		}
 		
 		
-		void TestPrepareContainerForConverting(ISimpleContainer simpleContainer)
+		void PrepareContainerForConverting(ISimpleContainer simpleContainer)
 		{
 			base.LayoutRow(simpleContainer);
 		}
 		
 		
-		void TestAfterConverting (ExporterCollection mylist,BaseSection section)
+		void AfterConverting (ExporterCollection mylist,BaseSection section)
 		{
 			StandardPrinter.EvaluateRow(base.Evaluator,mylist);
 			section.Items[0].Size = base.RestoreSize;

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

@@ -20,12 +20,12 @@ namespace ICSharpCode.Reports.Core.Exporter
 	/// </summary>
 	/// 
 	
-	public class RowConverter:BaseConverter
+	public class old_RowConverter:BaseConverter
 	{
 
 		private BaseReportItem parent;
 		
-		public RowConverter(IDataNavigator dataNavigator,
+		public old_RowConverter(IDataNavigator dataNavigator,
 		                    ExporterPage singlePage,
 		                   
 		                    ILayouter layouter):base(dataNavigator,singlePage,layouter)

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataNavigator.cs

@@ -22,7 +22,11 @@ using System.ComponentModel;
  			get;
  		}
  		
- 		// childList
+ 		#region Try make recursive
+ 		
+ 		#endregion
+ 		
+ 		// childList -----------------
  		
  		bool HasChildren {get;}
  		
@@ -34,7 +38,7 @@ using System.ComponentModel;
  		
  		void FillChild (ReportItemCollection collection);
  		
- 		// end child list
+ 		// end child list --------------------
  		
  		bool IsSorted {get;}