Cleanup

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

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

@@ -116,7 +116,6 @@
     <Compile Include="Project\Events\NewPageEventArgs.cs" />
     <Compile Include="Project\Events\ReportPageEventArgs.cs" />
     <Compile Include="Project\Events\ReportParametersEventArgs.cs" />
-    <Compile Include="Project\Exceptions\AsyncPageBuilderException.cs" />
     <Compile Include="Project\Exceptions\FieldNotFoundException.cs" />
     <Compile Include="Project\Exceptions\GroupLevelException.cs" />
     <Compile Include="Project\Exceptions\IllegalFileFormat.cs" />

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

@@ -86,7 +86,7 @@ namespace ICSharpCode.Reports.Core
 		
 	
 		
-		private Rectangle FindSurroundingRectangle_2 (Graphics graphics,IEnumerable<BaseReportItem> canGrowShrinkCollection)
+		private static Rectangle FindSurroundingRectangle_2 (Graphics graphics,IEnumerable<BaseReportItem> canGrowShrinkCollection)
 		{
 			int top = int.MaxValue;
 			Rectangle rec = new Rectangle(canGrowShrinkCollection.First().Location.X,

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Collections/Collections.cs

@@ -81,7 +81,7 @@ namespace ICSharpCode.Reports.Core{
 		}
 		
 		
-		
+		/*
 		public ExporterCollection ConvertAll<BaseExportColumn>(Converter<BaseReportItem, ICSharpCode.Reports.Core.Exporter.BaseExportColumn> converter)
 		{
 			List<ICSharpCode.Reports.Core.Exporter.BaseExportColumn> l  = InnerList.ConvertAll(converter);
@@ -89,7 +89,7 @@ namespace ICSharpCode.Reports.Core{
 			e.AddRange(l);
 			return e;
 		}
-		
+		*/
 		
 		public void AddRange(IEnumerable<BaseReportItem> items)
 		{

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exceptions/AsyncPageBuilderException.cs

@@ -1,48 +0,0 @@
-/*
- * Erstellt mit SharpDevelop.
- * Benutzer: Peter
- * Datum: 22.08.2009
- * Zeit: 20:01
- * 
- * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern.
- */
-using System;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-
-namespace ICSharpCode.Reports.Core
-{
-	/// <summary>
-	/// Description of AsyncPageBuilderException.
-	/// </summary>
-	public class AsyncPageBuilderException:Exception
-	{
-		public AsyncPageBuilderException():base ()
-		{
-		}
-		
-		public AsyncPageBuilderException(string errorMessage) :base (errorMessage)
-		{
-		}
-		
-		public AsyncPageBuilderException(string errorMessage,
-		                           Exception exception):base (errorMessage,exception)
-		{
-		}
-
-		
-		protected AsyncPageBuilderException(SerializationInfo info,
-		                              StreamingContext context) : base(info, context)
-		{
-			// Implement type-specific serialization constructor logic.
-		}
-
-		
-		[SecurityPermissionAttribute(SecurityAction.Demand,
-		                             SerializationFormatter = true)]
-		public override void GetObjectData(SerializationInfo info, StreamingContext context)
-		{
-			base.GetObjectData(info, context);
-		}
-	}
-}

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

@@ -90,70 +90,11 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		#region Converters
 		
-		/*
-		protected void ConvertSection (BaseSection section,int currentRow)
-		{
-			this.FireSectionRenderEvent (section ,currentRow);
-			this.Convert(section);
-		}
-		*/
-		/*
-		private void Convert (BaseSection section)
-		{
-			this.exportItemsConverter.Offset = section.SectionOffset;
-			PrintHelper.AdjustParent((BaseSection)section,section.Items);
-			ExporterCollection list = null;
-			
-			if (section.DrawBorder == true) {
-				BaseRectangleItem debugRectangle = new BaseRectangleItem();
-				debugRectangle = new BaseRectangleItem();
-				debugRectangle.Location = new Point (0 ,0);
-				debugRectangle.Size = new Size(section.Size.Width,section.Size.Height);
-				debugRectangle.FrameColor = section.FrameColor;
-				section.Items.Insert(0,debugRectangle);
-			}
-			
-			if (section.Items.Count > 0) {
-				
-				ISimpleContainer container = section.Items[0] as ISimpleContainer;
-				if (container != null) {
-
-					ExportContainer exportContainer = this.exportItemsConverter.ConvertToContainer(container);
-					this.exportItemsConverter.ParentLocation = exportContainer.StyleDecorator.Location;
-					
-					AdjustBackColor (container);
-					
-					ExporterCollection clist = container.Items.ConvertAll <BaseExportColumn> (this.exportItemsConverter.ConvertToLineItem) as ExporterCollection;
-					
-					exportContainer.Items.AddRange(clist);
-					list = new ExporterCollection();
-					list.Add(exportContainer);
-					
-				} else {
-					this.exportItemsConverter.ParentLocation = section.Location;
-					
-					Rectangle desiredRectangle = layouter.Layout(this.graphics,section);
-					Rectangle sectionRectangle = new Rectangle(0,0,section.Size.Width,section.Size.Height);
-					
-					if (!sectionRectangle.Contains(desiredRectangle)) {
-						section.Size = new Size(section.Size.Width,desiredRectangle.Size.Height);
-					}
-					
-				
-					list = section.Items.ConvertAll <BaseExportColumn> (this.exportItemsConverter.ConvertToLineItem);
-				}
-				if ((list != null) && (list.Count) > 0) {
-					this.singlePage.Items.AddRange(list);
-				}
-			}
-		}
-		*/
-		
 		
 		protected ExporterCollection ConvertSection (BaseSection section,int dataRow)
 		{
 			FireSectionRenderEvent (section ,dataRow);
-			this.exportItemsConverter.Offset = section.SectionOffset;
+			
 			PrintHelper.AdjustParent((BaseSection)section,section.Items);
 			
 			ExporterCollection list = new ExporterCollection();
@@ -164,22 +105,23 @@ namespace ICSharpCode.Reports.Core.Exporter
 			
 			if (section.Items.Count > 0) {
 				
+				Point offset = new Point(section.Location.X,section.SectionOffset);
 				foreach (IReportItem item in section.Items) {
 
 					ISimpleContainer container = item as ISimpleContainer;
 					if (container != null) {
-						ExportContainer exportContainer = this.exportItemsConverter.ConvertToContainer(container);
+
-						this.exportItemsConverter.ParentLocation = exportContainer.StyleDecorator.Location;
+						ExportContainer exportContainer = this.exportItemsConverter.ConvertToContainer(offset,container);
-						
+						                                                                               
 						AdjustBackColor (container);
 						
-						ExporterCollection clist = container.Items.ConvertAll <BaseExportColumn> (this.exportItemsConverter.ConvertToLineItem);
+						ExporterCollection clist = this.exportItemsConverter.ConvertSimpleItems(offset,container.Items);
-						
 						exportContainer.Items.AddRange(clist);
 						list.Add(exportContainer);
 						
 					} else {
-						this.exportItemsConverter.ParentLocation = section.Location;
+
+						this.exportItemsConverter.ParentRectangle = new Rectangle (section.Location,section.Size);
 						
 						Rectangle desiredRectangle = layouter.Layout(this.graphics,section);
 						Rectangle sectionRectangle = new Rectangle(0,0,section.Size.Width,section.Size.Height);
@@ -188,13 +130,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 							section.Size = new Size(section.Size.Width,desiredRectangle.Size.Height);
 						}
 						
-						list = section.Items.ConvertAll <BaseExportColumn> (this.exportItemsConverter.ConvertToLineItem);
+						list = this.exportItemsConverter.ConvertSimpleItems(offset,section.Items);
 					}
-					
-//				if ((list != null) && (list.Count) > 0) {
-					////					this.singlePage.Items.AddRange(list);
-//				}
-//			}
 				}
 			}
 			return list;

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

@@ -75,24 +75,23 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		protected  ExporterCollection ConvertItems (ISimpleContainer row,Point offset)		                                          
 		{
-			this.exportItemsConverter.Offset = offset.Y;
+
 			IExportColumnBuilder exportLineBuilder = row as IExportColumnBuilder;
 
 			if (exportLineBuilder != null) {
 
-				ExportContainer lineItem = this.exportItemsConverter.ConvertToContainer(row);
+				ExportContainer lineItem = this.exportItemsConverter.ConvertToContainer(offset,row);
 				BaseReportItem baseReportItem = row as BaseReportItem;
-				
+
-				this.exportItemsConverter.ParentLocation = baseReportItem.Location;
+				this.exportItemsConverter.ParentRectangle = new Rectangle(baseReportItem.Location,baseReportItem.Size);
-				
 				if (baseReportItem.BackColor != GlobalValues.DefaultBackColor) {
 					foreach (BaseReportItem i in row.Items) {
 						i.BackColor = baseReportItem.BackColor;
 					}
 				}
 				
-				ExporterCollection list = row.Items.ConvertAll <BaseExportColumn> (this.exportItemsConverter.ConvertToLineItem);
+				ExporterCollection list = this.exportItemsConverter.ConvertSimpleItems(offset,row.Items);
-				
+					
 				lineItem.Items.AddRange(list);
 				
 				ExporterCollection containerList = new ExporterCollection();
@@ -129,9 +128,6 @@ namespace ICSharpCode.Reports.Core.Exporter
 			get { return dataNavigator; }
 		}
 		
-		public IExportItemsConverter ExportItemsConverter {
-			get { return exportItemsConverter; }
-		}
 		
 		public ILayouter Layouter {
 			get { return layouter; }
@@ -140,9 +136,9 @@ namespace ICSharpCode.Reports.Core.Exporter
 		public Graphics Graphics {get;set;}
 		#endregion
 		
-		protected Size SaveSize
+		protected void  SaveSize(Size size)
 		{
-			set { this.saveSize = value;}
+			this.saveSize = size;
 		}
 		
 		

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

@@ -69,7 +69,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			do {
 				section.Location = new Point(section.Location.X,section.SectionOffset );
 				section.Size = this.SectionBounds.DetailSectionRectangle.Size;
-				base.SaveSize = section.Items[0].Size;
+				base.SaveSize(section.Items[0].Size);
 				
 				base.FillAndLayoutRow(simpleContainer);
 				base.FireSectionRendering(section);

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

@@ -8,7 +8,6 @@
  */
 using System;
 using System.Drawing;
-using System.Collections.Generic;
 using ICSharpCode.Reports.Core.Interfaces;
 
 namespace ICSharpCode.Reports.Core.Exporter
@@ -61,7 +60,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 				if (simpleContainer.Items.Count > 0) {
 					simpleContainer.Location = new Point (simpleContainer.Location.X + defaultLeftPos,simpleContainer.Location.Y);
 					simpleContainer.Parent = (BaseReportItem)this.baseTable;
-					base.SaveSize =  new Size (simpleContainer.Size.Width,simpleContainer.Size.Height);
+					base.SaveSize( new Size (simpleContainer.Size.Width,simpleContainer.Size.Height));
 					// Header/FooterRow
 				
 					if (PrintHelper.IsTextOnlyRow(simpleContainer) ) {
@@ -72,7 +71,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 					else 
 					{
 						// DataRegion
-						base.SaveSize = simpleContainer.Size;
+						base.SaveSize(simpleContainer.Size);
 						do {
 							//
 							BaseSection section = this.baseTable.Parent as BaseSection;

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Decorators/BaseStyleDecorator.cs

@@ -47,7 +47,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 
 
 		public iTextSharp.text.BaseColor PdfBackColor {
-			get {return this.ConvertToPdfBaseColor(this.backColor);}
+			get {return ConvertToPdfBaseColor(this.backColor);}
 		}
 
 
@@ -58,7 +58,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 
 
 		public iTextSharp.text.BaseColor PdfForeColor {
-			get {return this.ConvertToPdfBaseColor(this.foreColor);}
+			get {return ConvertToPdfBaseColor(this.foreColor);}
 		}
 
 		
@@ -69,7 +69,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 
 		public iTextSharp.text.BaseColor PdfFrameColor {
-			get {return this.ConvertToPdfBaseColor(frameColor);}
+			get {return ConvertToPdfBaseColor(frameColor);}
 		}
 		
 		public Point Location {
@@ -87,7 +87,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			get { return new Rectangle(this.location.X, this.location.Y, this.size.Width, this.size.Height); }
 		}
 		
-		private iTextSharp.text.BaseColor ConvertToPdfBaseColor (Color color)
+		private static iTextSharp.text.BaseColor ConvertToPdfBaseColor (Color color)
 		{
 			return new iTextSharp.text.BaseColor(color.R, color.G, color.B, color.A);
 		}

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/ExportItemsConverter.cs

@@ -14,14 +14,30 @@ namespace ICSharpCode.Reports.Core.Exporter
 	
 	public class ExportItemsConverter:IExportItemsConverter
 	{
-		private int offset;
+	
-		private Point parentLocation;
-
 		public ExportItemsConverter ()
 		{
 		}
 		
-		public BaseExportColumn ConvertToLineItem (BaseReportItem item)
+		
+		public ExporterCollection ConvertSimpleItems (Point offset,ReportItemCollection items)
+		{
+			if (items == null) {
+				throw new ArgumentNullException("items");
+			}
+			ExporterCollection col = new ExporterCollection();
+			if (items.Count > 0) {
+				
+				foreach(BaseReportItem item in items)
+				{
+					col.Add(ConvertToLineItem(offset,item));
+				}
+			}
+			return col;
+		}
+		
+		
+		private BaseExportColumn ConvertToLineItem (Point offset,BaseReportItem item)
 		{
 			if (item == null) {
 				throw new ArgumentNullException("item");
@@ -32,16 +48,15 @@ namespace ICSharpCode.Reports.Core.Exporter
 			
 			if (columnBuilder != null) {
 				lineItem = columnBuilder.CreateExportColumn();
-
-				lineItem.StyleDecorator.Location = new Point(this.parentLocation.X + lineItem.StyleDecorator.Location.X,
-				                                             lineItem.StyleDecorator.Location.Y + offset);
 				
+				lineItem.StyleDecorator.Location = new Point(this.ParentRectangle.Location.X + lineItem.StyleDecorator.Location.X,
+				                                             lineItem.StyleDecorator.Location.Y + offset.Y);
 			} 
 			return lineItem;
 		}
 		
 		
-		public ExportContainer ConvertToContainer (ISimpleContainer item) 
+		public ExportContainer ConvertToContainer (Point offset,ISimpleContainer item) 
 		{
 			if (item == null) {
 				throw new ArgumentNullException("item");
@@ -50,22 +65,16 @@ namespace ICSharpCode.Reports.Core.Exporter
 	
 			if (lineBuilder != null) {
 				ExportContainer lineItem = (ExportContainer)lineBuilder.CreateExportColumn();
+
 				lineItem.StyleDecorator.Location = new Point (lineItem.StyleDecorator.Location.X,
-				                                              this.offset);
+				                                              offset.Y);
+				
 				return lineItem;
 			}
 			return null;
 		}
 		
+		public Rectangle ParentRectangle {get;set;}
 		
-		public Point ParentLocation {
-			get { return parentLocation; }
-			set { parentLocation = value; }
-		}
-		
-	
-		public int Offset {
-			set { offset = value; }
-		}
 	}
 }

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Interfaces/IExportItemsConverter.cs

@@ -18,9 +18,10 @@ namespace ICSharpCode.Reports.Core.Exporter
 	
 	public interface IExportItemsConverter
 	{
-		BaseExportColumn ConvertToLineItem (BaseReportItem item);
+		ExporterCollection ConvertSimpleItems (Point offset,ReportItemCollection items);
-		ExportContainer ConvertToContainer (ISimpleContainer item);
+		
-		Point ParentLocation {get;set;}
+		ExportContainer ConvertToContainer (Point offset,ISimpleContainer item);
-		int Offset {set;}
+
+		Rectangle ParentRectangle {get;set;}
 	}
 }

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs

@@ -6,10 +6,10 @@
  * 
  * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern.
  */
-using ICSharpCode.Reports.Core.Exporter;
 using System;
 using System.Drawing;
 using ICSharpCode.Reports.Core.Events;
+using ICSharpCode.Reports.Core.Exporter;
 
 namespace ICSharpCode.Reports.Core.Interfaces
 {
@@ -25,7 +25,6 @@ namespace ICSharpCode.Reports.Core.Interfaces
 		IDataNavigator DataNavigator {get;}
 		Rectangle ParentRectangle {get;}
 		ExporterPage SinglePage {get;}
-		IExportItemsConverter ExportItemsConverter{get;}
 		ILayouter Layouter {get;}
 		Graphics Graphics {get;set;}
 	}