Change some FileNames

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

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

@@ -129,12 +129,12 @@
     <Compile Include="Project\Exceptions\UnknownItemException.cs" />
     <Compile Include="Project\Exceptions\WrongColumnException.cs" />
     <Compile Include="Project\Exceptions\WrongSectionException.cs" />
-    <Compile Include="Project\Exporter\Converters\GroupedRowConverter.cs" />
+    <Compile Include="Project\Exporter\Converters\old_GroupedRowConverter.cs" />
     <Compile Include="Project\Expressions\SimpleExpressionEvaluator\Compilation\Functions\ReportingService\FieldReference.cs" />
     <Compile Include="Project\Exporter\BasePager.cs" />
     <Compile Include="Project\Exporter\Converters\BaseConverter.cs" />
     <Compile Include="Project\Exporter\Converters\ConverterFactory.cs" />
-    <Compile Include="Project\Exporter\Converters\RowConverter.cs" />
+    <Compile Include="Project\Exporter\Converters\GroupedRowConverter.cs" />
     <Compile Include="Project\Exporter\Converters\TableConverter.cs" />
     <Compile Include="Project\Exporter\Decorators\IBaseStyleDecorator.cs" />
     <Compile Include="Project\Exporter\Decorators\ILineDecorator.cs" />

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs

@@ -143,14 +143,7 @@ namespace ICSharpCode.Reports.Core
 			ce.MoveNext();
 		}
 		
-		
-		public object ReadChild()
-		{
-			var i = ce.Current.ListIndex;
-			TableStrategy t = store as TableStrategy;
-			return t.Readrandowm (i);
-		}
-		
+	
 		
 		public int ChildListCount
 		{

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

@@ -20,12 +20,12 @@ namespace ICSharpCode.Reports.Core.Exporter
 	/// </summary>
 	/// 
 	
-	public class GroupedRowConverter:BaseConverter
+	public class old_RowConverter:BaseConverter
 	{
 
 		private BaseReportItem parent;
 		
-		public GroupedRowConverter(IDataNavigator dataNavigator,
+		public old_RowConverter(IDataNavigator dataNavigator,
 		                    ExporterPage singlePage,
 		                    
 		                    ILayouter layouter):base(dataNavigator,singlePage,layouter)
@@ -73,7 +73,6 @@ namespace ICSharpCode.Reports.Core.Exporter
 				section.Size = this.SectionBounds.DetailSectionRectangle.Size;
 				base.SaveSize(section.Items[0].Size);
 				Color color = ((BaseReportItem)simpleContainer).BackColor;
-				
 				if (base.DataNavigator.HasChildren)
 				{
 					TestDecorateElement(simpleContainer);
@@ -88,7 +87,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 				currentPosition = base.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
 				
 				TestAfterConverting (mylist,section);
-	
+			// Grouping starts
 				if (base.DataNavigator.HasChildren) {
 					
 					((BaseReportItem)simpleContainer).BackColor = color;
@@ -108,7 +107,9 @@ namespace ICSharpCode.Reports.Core.Exporter
 					while ( base.DataNavigator.ChildMoveNext());
 
 				}
-	
+			
+				// 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;

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

@@ -27,7 +27,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		public RowConverter(IDataNavigator dataNavigator,
 		                    ExporterPage singlePage,
-		                    
+		                   
 		                    ILayouter layouter):base(dataNavigator,singlePage,layouter)
 		{
 		}
@@ -66,50 +66,31 @@ namespace ICSharpCode.Reports.Core.Exporter
 			BaseSection section = parent as BaseSection;
 			
 			int defaultLeftPos = parent.Location.X;
-
+			
 			do {
+				Console.WriteLine ("haschild {0}",base.DataNavigator.HasChildren);
+				if (base.DataNavigator.HasChildren) {
+					ReadFromChilds(base.DataNavigator);
+				}
 				
-				PrintHelper.AdjustSectionLocation (section);
+				section.Location = new Point(section.Location.X,section.SectionOffset );
 				section.Size = this.SectionBounds.DetailSectionRectangle.Size;
 				base.SaveSize(section.Items[0].Size);
-				Color color = ((BaseReportItem)simpleContainer).BackColor;
-				if (base.DataNavigator.HasChildren)
-				{
-					TestDecorateElement(simpleContainer);
-				}
-			
+				
 				base.FillRow(simpleContainer);
 				
-				TestPrepareContainerForConverting(simpleContainer);
-
+				base.LayoutRow(simpleContainer);
+				
 				base.FireSectionRendering(section);
-
+				
 				currentPosition = base.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
 				
-				TestAfterConverting (mylist,section);
-			// Grouping starts
-				if (base.DataNavigator.HasChildren) {
-					
-					((BaseReportItem)simpleContainer).BackColor = color;
-					base.DataNavigator.SwitchGroup();
-					do {
-						((BaseReportItem)simpleContainer).BackColor = color;
-
-						base.DataNavigator.FillChild(simpleContainer.Items);
-						TestPrepareContainerForConverting(simpleContainer);
-
-						base.FireSectionRendering(section);
-
-						currentPosition = base.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
-
-						TestAfterConverting (mylist,section);
-					}
-					while ( base.DataNavigator.ChildMoveNext());
+				StandardPrinter.EvaluateRow(base.Evaluator,mylist);
+				
+				section.Items[0].Size = base.RestoreSize;
+				section.SectionOffset += section.Size.Height + 3 * GlobalValues.GapBetweenContainer;
 
-				}
-			
-				// 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;
@@ -117,8 +98,12 @@ namespace ICSharpCode.Reports.Core.Exporter
 					mylist.Clear();
 				}
 				
-				ShouldDrawBorder (section,mylist);
-				
+				if (section.DrawBorder == true) {
+					BaseRectangleItem br = BasePager.CreateDebugItem (section);
+					BaseExportColumn bec = br.CreateExportColumn();
+					bec.StyleDecorator.Location = section.Location;
+					mylist.Insert(0,bec);
+				}
 			}
 			while (base.DataNavigator.MoveNext());
 			
@@ -130,36 +115,15 @@ namespace ICSharpCode.Reports.Core.Exporter
 		}
 		
 		
-		void TestPrepareContainerForConverting(ISimpleContainer simpleContainer)
-		{
-			base.LayoutRow(simpleContainer);
-		}
-		
-		
-		void TestAfterConverting (ExporterCollection mylist,BaseSection section)
+		void ReadFromChilds (IDataNavigator nav)
 		{
-			StandardPrinter.EvaluateRow(base.Evaluator,mylist);
-			section.Items[0].Size = base.RestoreSize;
-			section.SectionOffset += section.Size.Height + 3 * GlobalValues.GapBetweenContainer;
-		}
-		
-		
-		Color TestDecorateElement(ISimpleContainer simpleContainer)
-		{
-			BaseReportItem i = simpleContainer as BaseReportItem;
-			var retval = i.BackColor;
-			i.BackColor = System.Drawing.Color.LightGray;
-			return retval;
-		}
-		
-		void ShouldDrawBorder (BaseSection section,ExporterCollection list)
-		{
-			if (section.DrawBorder == true) {
-				BaseRectangleItem br = BasePager.CreateDebugItem (section);
-				BaseExportColumn bec = br.CreateExportColumn();
-				bec.StyleDecorator.Location = section.Location;
-				list.Insert(0,bec);
-			}
+//			nav.SwitchGroup();
+//			do {
+//				var o = nav.ReadChild() as System.Data.DataRow;
+//				string v = o.ItemArray[3].ToString();
+//					Console.WriteLine("\t {0}",v);
+//			}
+//			while ( nav.ChildMoveNext());
 		}
 	}
-}
+}

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

@@ -21,18 +21,20 @@ using System.ComponentModel;
  		bool HasMoreData {
  			get;
  		}
- 		//Test
+ 		
+ 		// childList
  		
  		bool HasChildren {get;}
  		
  		void SwitchGroup();
  		
- 		object ReadChild ();
- 		
  		bool ChildMoveNext();
+ 		
  		int ChildListCount {get;}
+ 		
  		void FillChild (ReportItemCollection collection);
- 		//endtest
+ 		
+ 		// end child list
  		
  		bool IsSorted {get;}
  		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/DataManager/GroupTableFixture.cs

@@ -59,6 +59,7 @@ namespace ICSharpCode.Reports.Core.Test.DataManager
 			}
 		}
 		
+		#region Read-Fill Child List
 		
 		[Test]
 		public void Can_FillChild()
@@ -96,72 +97,8 @@ namespace ICSharpCode.Reports.Core.Test.DataManager
 			while ( nav.ChildMoveNext());
 		}
 		
+		#endregion
 		
-		[Test]
-		public void Can_Read_Grouped_List()
-		{
-			var dataNav = PrepareStandardGrouping();
-			while (dataNav.MoveNext()) {
-				if (dataNav.HasChildren) {
-					Assert.That(dataNav.HasChildren,Is.True);
-					DataRow r = dataNav.Current as DataRow;
-					string v2 = r["last"].ToString() + " GroupVal :" +  r[3].ToString();
-					Console.WriteLine(v2);
-					ReadChildList(dataNav);
-				}
-				
-			}
-		}
-		
-		
-		void ReadChildList (IDataNavigator nav)
-		{
-			nav.SwitchGroup();
-			do {
-				var o = nav.ReadChild() as DataRow;
-				string v = o.ItemArray[3].ToString();
-				Console.WriteLine("\t {0}",v);
-			}
-			while ( nav.ChildMoveNext());
-		}
-		
-		
-		
-		/*
-	
-		[Test]
-		public void ChildNavigator_Can_Init()
-		{
-			var dataNav = PrepareStandardGrouping();
-			Console.WriteLine("start list");
-			while (dataNav.MoveNext())
-			{
-				DataRow r = dataNav.Current as DataRow;
-				string v2 = r["Groupitem"].ToString();
-				Console.WriteLine(" - {0}  ",v2);
-				ChildNavigator childNav = dataNav.GetChildNavigator();
-				Assert.That(childNav != null);
-			}
-		}
-		
-		*/
-		
-		
-		/*
-		
-		[Test]
-		public void ChildNavigator_All_Childs_Contains_Elements()
-		{
-			var dataNav = PrepareStandardGrouping();
-			Console.WriteLine("start list");
-			while (dataNav.MoveNext())
-			{
-				ChildNavigator childNav = dataNav.GetChildNavigator();
-				Assert.That(childNav.IndexList.Count > 0);
-			}
-		}
-		*/
-				
 		private IDataNavigator PrepareStandardGrouping ()
 		{
 			GroupColumn gc = new GroupColumn("GroupItem",1,ListSortDirection.Ascending);