From 40b3fb239b76f0ed46617aad36a8a2a7f81a14df Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Sat, 17 Jul 2010 03:11:58 +0000 Subject: [PATCH] Remove TestExporter, adjust Namespaces git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@6130 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../ICSharpCode.Reports.Core.csproj | 9 - .../BaseClasses/Printing/PrintHelper.cs | 2 +- .../BaseClasses/Printing/StandardPrinter.cs | 2 +- .../BaseClasses/Printing/TextDrawer.cs | 2 +- .../Project/BaseItems/BaseDataItem.cs | 2 +- .../Project/BaseItems/BaseGraphicItem.cs | 2 +- .../Project/BaseItems/BaseReportItem.cs | 2 +- .../Project/BaseItems/BaseRowItem.cs | 2 +- .../Project/BaseItems/BaseTableItem.cs | 4 +- .../Project/BaseItems/BaseTextItem.cs | 2 +- .../Project/BaseItems/ErrorItem.cs | 2 +- .../BaseItems/Graphics/BaseCircleItem.cs | 2 +- .../BaseItems/Graphics/BaseImageItem.cs | 2 +- .../BaseItems/Graphics/BaseLineItem.cs | 2 +- .../BaseItems/Graphics/BaseRectangleItem.cs | 2 +- .../Project/Collections/Collections.cs | 2 +- .../Exporter/AbstractExportListBuilder.cs | 195 ------------------ .../Project/Exporter/AbstractReportCreator.cs | 92 --------- .../Exporter/Converter/ItemsConverter.cs | 73 ------- .../Project/Exporter/DataExportListBuilder.cs | 106 ---------- .../Project/Exporter/DataReportCreator.cs | 65 ------ .../Project/Exporter/PageCreatedEventArgs.cs | 31 --- .../Project/Exporter/PageDescription.cs | 44 ---- .../Expressions/ExpressionEvaluatorFacade.cs | 2 +- .../Project/Globals/PdfHelper.cs | 4 +- .../Project/IReportCreator.cs | 13 +- .../Project/Interfaces/IContainerItem.cs | 2 +- .../Project/Interfaces/IItemConverter.cs | 2 +- .../Project/Printing/Graphics/BaseShape.cs | 2 +- .../Project/Printing/Graphics/Border.cs | 2 +- .../Project/Printing/Graphics/EllipseShape.cs | 2 +- .../Project/Printing/Graphics/LineShape.cs | 2 +- .../Printing/Graphics/RectangleShape.cs | 2 +- .../Project/ReportEngine.cs | 2 +- .../ReportViewer/PageNavigationEventArgs.cs | 2 +- .../Project/ReportViewer/ReportViewer.cs | 4 +- .../Project/old_Exporter/BasePager.cs | 2 +- .../old_Exporter/Converters/BaseConverter.cs | 2 +- .../Converters/ConverterFactory.cs | 2 +- .../old_Exporter/Converters/RowConverter.cs | 2 +- .../old_Exporter/Converters/TableConverter.cs | 2 +- .../Project/old_Exporter/DataPageBuilder.cs | 2 +- .../Decorators/BaseStyleDecorator.cs | 7 +- .../Decorators/GraphicStyleDecorator.cs | 2 +- .../Decorators/IBaseStyleDecorator.cs | 2 +- .../old_Exporter/Decorators/ILineDecorator.cs | 2 +- .../old_Exporter/Decorators/Linedecorator.cs | 2 +- .../Decorators/TextStyleDecorator.cs | 2 +- .../ExportColumns/BaseExportColumn.cs | 8 +- .../ExportColumns/ExportContainer.cs | 4 +- .../ExportColumns/ExportGraphic.cs | 4 +- .../old_Exporter/ExportColumns/ExportImage.cs | 4 +- .../old_Exporter/ExportColumns/ExportText.cs | 4 +- .../ExportColumns/IExportColumnBuilder .cs | 2 +- .../ExportColumns/IExportContainer.cs | 4 +- .../old_Exporter/ExportItemsConverter.cs | 2 +- .../ExportRenderer/BaseExportRenderer.cs | 4 +- .../ExportRenderer/HTMLRenderer.cs | 2 +- .../ExportRenderer/PdfRenderer.cs | 4 +- .../ExportRenderer/PreviewRenderer.cs | 2 +- .../ExportRenderer/PrintRenderer.cs | 2 +- .../ExportRenderer/XPSRenderer.cs | 2 +- .../Project/old_Exporter/ExporterPage.cs | 2 +- .../Project/old_Exporter/FormPageBuilder.cs | 2 +- .../Project/old_Exporter/PageEventArgs.cs | 2 +- .../BaseItems/BaseDataItemFixture.cs | 2 +- .../BaseItems/BaseGraphicItemFixture.cs | 2 +- .../BaseItems/BaseRowItemFixture.cs | 2 +- .../BaseItems/BaseTextItemFixture.cs | 2 +- .../Exporter/AbstractExportListBuilder.cs | 24 --- .../Converter/ItemsConverterFixture.cs | 98 --------- .../Exporter/DataListBuilderFixture.cs | 173 ---------------- .../Exporter/DataPageBuilderFixture.cs | 114 ---------- .../ICSharpCode.Reports.Core.Test.csproj | 6 - 74 files changed, 75 insertions(+), 1119 deletions(-) delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractExportListBuilder.cs delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractReportCreator.cs delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converter/ItemsConverter.cs delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataExportListBuilder.cs delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataReportCreator.cs delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageCreatedEventArgs.cs delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageDescription.cs delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/AbstractExportListBuilder.cs delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/Converter/ItemsConverterFixture.cs delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/DataListBuilderFixture.cs delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/DataPageBuilderFixture.cs diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj index 42fb4cb184..fc44519dc7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj @@ -128,13 +128,6 @@ - - - - - - - @@ -359,9 +352,7 @@ - - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs index cf30269526..01800c09f8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs @@ -13,7 +13,7 @@ using System.Globalization; using System.Linq; using ICSharpCode.Reports.Core.Interfaces; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; using ICSharpCode.Reports.Expressions.ReportingLanguage; namespace ICSharpCode.Reports.Core.BaseClasses.Printing diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs index 10b0123eb2..6e3ecaf0e4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs @@ -9,7 +9,7 @@ using System; using System.Drawing; using ICSharpCode.Reports.Core.Interfaces; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; using ICSharpCode.Reports.Expressions.ReportingLanguage; namespace ICSharpCode.Reports.Core.BaseClasses.Printing diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/TextDrawer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/TextDrawer.cs index 7833be90d6..951f1f971e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/TextDrawer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/TextDrawer.cs @@ -45,7 +45,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing public static void DrawString (Graphics graphics,string text, - ICSharpCode.Reports.Core.old_Exporter.TextStyleDecorator decorator) + ICSharpCode.Reports.Core.Exporter.TextStyleDecorator decorator) { if (graphics == null) { throw new ArgumentNullException("graphics"); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs index 0f9f222ffd..de6de562c2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs @@ -11,7 +11,7 @@ using System.Drawing; using System.Xml.Serialization; using ICSharpCode.Reports.Core.BaseClasses.Printing; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; /// /// This Class is used for Databased items diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGraphicItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGraphicItem.cs index 09c3ba308c..3559657016 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGraphicItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGraphicItem.cs @@ -11,7 +11,7 @@ using System.Drawing; using System.Drawing.Drawing2D; using System.Xml.Serialization; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; namespace ICSharpCode.Reports.Core { /// diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs index 5fefe1cb3e..afc6eb473c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs @@ -11,7 +11,7 @@ using System.Drawing; using System.Xml.Serialization; using ICSharpCode.Reports.Core.BaseClasses.Printing; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; /// /// This Class is the BaseClass for diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseRowItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseRowItem.cs index 98e09256a7..223634c6a6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseRowItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseRowItem.cs @@ -10,7 +10,7 @@ using System.ComponentModel; using System.Drawing; using ICSharpCode.Reports.Core.BaseClasses.Printing; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; using ICSharpCode.Reports.Core.Interfaces; namespace ICSharpCode.Reports.Core{ diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs index f7d46005c8..4e7c1d2b75 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs @@ -8,7 +8,7 @@ using ICSharpCode.Reports.Expressions.ReportingLanguage; using System; using System.Drawing; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; using ICSharpCode.Reports.Core.Interfaces; namespace ICSharpCode.Reports.Core { @@ -36,7 +36,7 @@ namespace ICSharpCode.Reports.Core { #region IExportColumnBuilder - public ICSharpCode.Reports.Core.old_Exporter.BaseExportColumn CreateExportColumn() + public ICSharpCode.Reports.Core.Exporter.BaseExportColumn CreateExportColumn() { BaseStyleDecorator st = this.CreateItemStyle(); ExportContainer item = new ExportContainer(st); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs index 8f43301ea4..ae0294d097 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs @@ -8,7 +8,7 @@ using System; using System.Drawing; using ICSharpCode.Reports.Core.BaseClasses.Printing; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; /// /// This class is the BaseClass for all TextBased Items diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/ErrorItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/ErrorItem.cs index cf2363ab0b..ee0d3743b5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/ErrorItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/ErrorItem.cs @@ -9,7 +9,7 @@ using System; using System.Drawing; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; namespace ICSharpCode.Reports.Core { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseCircleItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseCircleItem.cs index 69a050d850..011418db39 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseCircleItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseCircleItem.cs @@ -7,7 +7,7 @@ using System; using System.Drawing; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; /// ///This class drwas a Circle diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs index b9e03c1635..8f3e03c7e4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs @@ -17,7 +17,7 @@ using System.Drawing; using System.Globalization; using System.IO; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; namespace ICSharpCode.Reports.Core { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs index 645d0b4d3c..ab2c2e364d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs @@ -9,7 +9,7 @@ using System; using System.ComponentModel; using System.Drawing; using System.Drawing.Drawing2D; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; /// diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseRectangleItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseRectangleItem.cs index ff02c22d96..a12871576a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseRectangleItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseRectangleItem.cs @@ -8,7 +8,7 @@ using System; using System.Drawing; using ICSharpCode.Reports.Core.BaseClasses.Printing; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; /// /// This class draws a Rectangle diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs index 5ea7ce314c..d6a3765414 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs @@ -11,7 +11,7 @@ using System.Collections.ObjectModel; using System.Globalization; using System.Linq; using ICSharpCode.Reports.Core; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; namespace ICSharpCode.Reports.Core{ diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractExportListBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractExportListBuilder.cs deleted file mode 100644 index 454b53b68a..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractExportListBuilder.cs +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 24.05.2010 - * Time: 19:53 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Drawing; -using System.Linq; - -using ICSharpCode.Reports.Core.BaseClasses.Printing; -using ICSharpCode.Reports.Core.Exporter.Converter; -using ICSharpCode.Reports.Core.Interfaces; - -namespace ICSharpCode.Reports.Core.Exporter -{ - /// - /// Description of AbstractExportListBuilder. - /// - public class AbstractExportListBuilder - { - - private readonly object pageLock = new object(); - private readonly IItemsConverter itemsConverter; - - private PageDescriptions pages; - - public event EventHandler PageCreated; - public event EventHandler SectionRendering; - - - public AbstractExportListBuilder (IReportModel reportModel,IItemsConverter itemsConverter) - { - this.ReportModel = reportModel; - this.itemsConverter = itemsConverter; - } - - - public virtual void WritePages () - { - - } - - - - protected virtual Point BuildReportHeader (Point reportHeaderStart) - { - System.Console.WriteLine("BuildReportHeader at {0} with {1} items ",reportHeaderStart,ReportModel.ReportHeader.Items.Count); - - BaseSection section = ReportModel.ReportHeader; - Size size = section.Size; - Point retval = Point.Empty; - - if ((!CanGrow(section.Items)) | (!CanShrink(section.Items))) { - ReportItemCollection result = itemsConverter.Convert(section,section.Items); - this.SinglePage.Items.AddRange(result); - - retval = itemsConverter.LocationAfterConvert; - } else { - retval = new Point (reportHeaderStart.X , 150); - } - - return retval; - } - - - private bool CanGrow (IEnumerable collection) - { - IEnumerable canGrowShrinkCollection = from bt in collection where bt.CanGrow == true select bt; - return (canGrowShrinkCollection.Count() > 0); - } - - - private bool CanShrink (IEnumerable collection) - { - IEnumerable canGrowShrinkCollection = from bt in collection where bt.CanShrink == true select bt; - return (canGrowShrinkCollection.Count() > 0); - } - - - protected virtual void BuildPageHeader () - { - System.Diagnostics.Trace.WriteLine(" BuildPageHeader"); - } - - - protected virtual void BuildDetailInternal (BaseSection section) - { - System.Diagnostics.Trace.WriteLine("BuildDetailInterna "); - } - - - protected virtual void BuildPageFooter () - { - System.Diagnostics.Trace.WriteLine("BuildPageFooter "); - } - - protected virtual void BuildReportFooter () - { - System.Diagnostics.Trace.WriteLine("BuildReportFooter "); - } - - - protected virtual void FinishRendering () - { - - } - - - protected virtual void CreateNewPage () - { - this.SinglePage = this.InitNewPage(); - - - PrintHelper.InitPage(this.SinglePage,this.ReportModel.ReportSettings); - this.SinglePage.CalculatePageBounds(this.ReportModel); - -// this.pageFull = false; - } - - - - - private PageDescription InitNewPage () - { - SectionBounds sectionBounds = new SectionBounds (ReportModel.ReportSettings,(this.Pages.Count == 0)); - return new PageDescription(sectionBounds,Pages.Count + 1); - } - - - - protected void AddPage (PageDescription page) - { - if (page == null) { - throw new ArgumentNullException("page"); - } -// lock (addLock) { - Pages.Add(page); - -// } - FirePageCreated(page); - } - - - #region Event's - - - protected void FirePageCreated(PageDescription page) - { - EventHelper.Raise(PageCreated,this, - new NewPageCreatedEventArgs(page)); - } - - - protected void FireSectionRenderEvent (BaseSection section,int currentRow) - { - SectionRenderEventArgs ea = - new SectionRenderEventArgs(section, - pages.Count, - currentRow, - section); - - EventHelper.Raise(SectionRendering,this,ea); - } - - - #endregion - - - public PageDescription SinglePage {get;private set;} - - public IReportModel ReportModel {get;private set;} - - public Point PositionAfterRenderSection {get;set;} - - - public PageDescriptions Pages - { - get { - lock(pageLock) { - if (this.pages == null) { - pages = new PageDescriptions(); - - } - return pages; - } - } - } - - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractReportCreator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractReportCreator.cs deleted file mode 100644 index b9b5f01901..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/AbstractReportCreator.cs +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 14.05.2010 - * Time: 19:48 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -using System; -using System.Drawing; -using ICSharpCode.Reports.Core.Interfaces; - -namespace ICSharpCode.Reports.Core.Exporter -{ - /// - /// Description of BaseReportCreator. - /// - public class AbstractReportCreator:IReportCreator_2 - { - - - public AbstractReportCreator(IReportModel reportModel) - { - if (reportModel == null) { - throw new ArgumentNullException("ReportModel"); - } - - this.ReportModel = reportModel; - } - - - #region Convertion - - /* - protected virtual void BuildReportHeader () - { - } - - protected virtual void BuildPageHeader () - { - } - - protected virtual void BuildDetailInternal (BaseSection section) - { - } - - protected virtual void BuildPageFooter () - { - } - - protected virtual void BuildReportFooter () - { - } - - */ - - public virtual void BuildExportList () - { - this.Pages.Clear(); - AbstractExportListBuilder.WritePages(); - } - - protected virtual void AddPage () - { - } - - #endregion - - - - protected IReportModel ReportModel {get; set;} - - protected AbstractExportListBuilder AbstractExportListBuilder {get;set;} - - #region IReportCreator - - public event EventHandler PageCreated; - - public event EventHandler SectionRendering; - - - public virtual PageDescriptions Pages { - get { - return AbstractExportListBuilder.Pages; - - } - } - - - #endregion - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converter/ItemsConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converter/ItemsConverter.cs deleted file mode 100644 index 3b8a586d5f..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converter/ItemsConverter.cs +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 21.05.2010 - * Time: 19:35 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Drawing; -using iTextSharp.text; - -namespace ICSharpCode.Reports.Core.Exporter.Converter -{ - - public interface IItemsConverter - { - ReportItemCollection Convert (BaseReportItem parent,IEnumerable itemsSource); - Point LocationAfterConvert {get;} - } - - - /// - /// Description of ItemsConverterr. - /// - - - public class ItemsConverter:IItemsConverter - { - Point locationAfterConvert; - - - - public ItemsConverter() - { - } - - - - public ReportItemCollection Convert (BaseReportItem parent,IEnumerable itemsSource) - { - var col = new ReportItemCollection(); - foreach (BaseReportItem item in itemsSource) { - item.Location = AdjustLocation (parent,item); - col.Add(item); - } - this.locationAfterConvert = AdjustLocationAfterDraw(parent); - return col; - } - - - - - private static Point AdjustLocation (IReportItem parent , IReportItem item) - { - return new Point(parent.Location.X + item.Location.X,parent.Location.Y + item.Location.Y); - } - - - private static Point AdjustLocationAfterDraw (IReportItem parent) - { - return new Point(parent.Location.X + parent.Size.Width,parent.Location.Y + parent.Size.Height); - } - - - public Point LocationAfterConvert { - get { return locationAfterConvert; } - } - } - -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataExportListBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataExportListBuilder.cs deleted file mode 100644 index 44e496456e..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataExportListBuilder.cs +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 15.05.2010 - * Time: 18:21 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -using System; -using System.Collections.ObjectModel; -using System.Drawing; -using ICSharpCode.Reports.Core.Exporter.Converter; -using ICSharpCode.Reports.Core.Interfaces; - -namespace ICSharpCode.Reports.Core.Exporter -{ - /// - /// Description of BuildExportList. - /// - public class DataExportListBuilder:AbstractExportListBuilder - { - - - public DataExportListBuilder(IReportModel reportModel,IDataManager dataManager):base(reportModel,new ItemsConverter()) - { - this.DataManager = dataManager; - this.DataManager.GetNavigator.MoveNext(); - - } - - /// - /// This constructor os ONLY for testing reasons - /// - - public DataExportListBuilder (IReportModel reportModel,IDataManager dataManager,IItemsConverter itemsConverter):base(reportModel,itemsConverter) - { - } - - - public override void WritePages () - { - base.CreateNewPage(); - - base.PositionAfterRenderSection = this.BuildReportHeader(SinglePage.SectionBounds.ReportHeaderRectangle.Location); - - this.BuildPageHeader(); - - - this.BuildDetailInternal (base.ReportModel.DetailSection); -// - this.BuildReportFooter(); - this.BuildPageFooter(); - - - base.AddPage(base.SinglePage); - //base.FinishRendering(this.dataNavigator); - } - - - protected override System.Drawing.Point BuildReportHeader(System.Drawing.Point reportHeaderStart) - { - - Point p = base.BuildReportHeader(reportHeaderStart); - base.FireSectionRenderEvent(ReportModel.ReportHeader,0); - return p; - } - - - - protected override void BuildPageHeader() - { - base.FireSectionRenderEvent(ReportModel.PageHeader,0); - base.BuildPageHeader(); - - } - - protected override void BuildDetailInternal(BaseSection section) - { - base.FireSectionRenderEvent(ReportModel.DetailSection,0); - base.BuildDetailInternal(section); - } - - protected override void BuildPageFooter() - { - base.FireSectionRenderEvent(ReportModel.ReportFooter,0); - base.BuildPageFooter(); - } - - - protected override void BuildReportFooter() - { - base.FireSectionRenderEvent(ReportModel.ReportFooter,0); - base.BuildReportFooter(); - } - - - public IDataManager DataManager {get; private set;} - - } - - public class PageDescriptions :Collection - { - - } - -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataReportCreator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataReportCreator.cs deleted file mode 100644 index a75fcc0b66..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataReportCreator.cs +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 13.05.2010 - * Time: 19:58 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ - -using System; -using ICSharpCode.Reports.Core.Interfaces; - - -namespace ICSharpCode.Reports.Core.Exporter -{ - /// - /// Description of DataReportCreator. - /// - public class DataReportCreator:AbstractReportCreator - { - - IReportModel reportModel; - IDataManager dataManager; - ILayouter layouter; - - #region Constructor - - - - public static AbstractReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager,ILayouter layouter) - { - if (reportModel == null) { - throw new ArgumentNullException("reportModel"); - } - if (dataManager == null) { - throw new ArgumentNullException("dataManager"); - } - if (layouter == null) { - throw new ArgumentNullException("layouter"); - } - var instance = new DataReportCreator(reportModel,dataManager,layouter); - - return instance; - } - - - private DataReportCreator (IReportModel reportModel,IDataManager dataManager,ILayouter layouter):base(reportModel) - { - this.reportModel = reportModel; - this.dataManager = dataManager; - this.layouter = layouter; - - base.AbstractExportListBuilder = new DataExportListBuilder(reportModel,dataManager); - } - - #endregion - - public override void BuildExportList() - { - base.AbstractExportListBuilder.WritePages(); - - } - - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageCreatedEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageCreatedEventArgs.cs deleted file mode 100644 index 05893c0048..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageCreatedEventArgs.cs +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 24.05.2010 - * Time: 20:04 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -using System; -using ICSharpCode.Reports.Core.Exporter; - -namespace ICSharpCode.Reports.Core.Exporter -{ - /// - /// Description of PageCreatedEventArgs. - /// - public class NewPageCreatedEventArgs:System.EventArgs - { - PageDescription singlePage; - - public NewPageCreatedEventArgs(PageDescription page) - { - this.singlePage = page; - } - - - public PageDescription SinglePage { - get { return singlePage; } - } - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageDescription.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageDescription.cs deleted file mode 100644 index b92422984d..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/PageDescription.cs +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 16.05.2010 - * Time: 19:06 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -using System; - -namespace ICSharpCode.Reports.Core.Exporter -{ - /// - /// Description of PageDescription. - /// - - - public class PageDescription:SinglePage - { - - private ReportItemCollection items; - - - public PageDescription (SectionBounds sectionBounds,int pageNumber):base(sectionBounds,pageNumber) - { - if (sectionBounds == null) { - throw new ArgumentNullException("sectionBounds"); - } - this.SectionBounds = sectionBounds; - } - - - public ReportItemCollection Items - { - get { - if (this.items == null) { - this.items = new ReportItemCollection(); - } - return this.items; - } - } - - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs index 42742118c2..e20716b4ba 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs @@ -9,7 +9,7 @@ using ICSharpCode.Reports.Core.Interfaces; using System; using ICSharpCode.Reports.Core; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; using ICSharpCode.Reports.Expressions.ReportingLanguage; using SimpleExpressionEvaluator; using SimpleExpressionEvaluator.Evaluation; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/PdfHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/PdfHelper.cs index e7b714a67e..c9af09c36c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/PdfHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Globals/PdfHelper.cs @@ -18,9 +18,9 @@ namespace ICSharpCode.Reports.Core public class ScreenRectToPdfRectConverter :System.Drawing.RectangleConverter { - ICSharpCode.Reports.Core.old_Exporter.ExportRenderer.PdfUnitConverter converter; + ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter; - public ScreenRectToPdfRectConverter(ICSharpCode.Reports.Core.old_Exporter.ExportRenderer.PdfUnitConverter converter) + public ScreenRectToPdfRectConverter(ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter) { if (converter == null) { throw new ArgumentNullException("converter"); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/IReportCreator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/IReportCreator.cs index 2f8fa7184d..3ad6e6cc4b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/IReportCreator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/IReportCreator.cs @@ -6,9 +6,9 @@ * * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. */ -using ICSharpCode.Reports.Core.Exporter; -using ICSharpCode.Reports.Core.old_Exporter; + using System; +using ICSharpCode.Reports.Core.Exporter; namespace ICSharpCode.Reports.Core { @@ -22,13 +22,4 @@ namespace ICSharpCode.Reports.Core event EventHandler PageCreated; event EventHandler SectionRendering; } - - - public interface IReportCreator_2 - { - void BuildExportList (); - PageDescriptions Pages{get;} - event EventHandler PageCreated; - event EventHandler SectionRendering; - } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IContainerItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IContainerItem.cs index a062799fbe..2265d9027d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IContainerItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IContainerItem.cs @@ -9,7 +9,7 @@ using System; using System.Drawing; using System.Windows.Forms; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; using ICSharpCode.Reports.Expressions.ReportingLanguage; namespace ICSharpCode.Reports.Core.Interfaces diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs index 24ca859d44..553513d6ca 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs @@ -9,7 +9,7 @@ using System; using System.Drawing; using ICSharpCode.Reports.Core.Events; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; namespace ICSharpCode.Reports.Core.Interfaces { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseShape.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseShape.cs index abb1c86776..1c13184c62 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseShape.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/BaseShape.cs @@ -9,7 +9,7 @@ using System; using System.Drawing; using System.Drawing.Drawing2D; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; using iTextSharp.text.pdf; /// diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs index 25a2e940f5..2ae53e20f8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs @@ -50,7 +50,7 @@ namespace ICSharpCode.Reports.Core { public void DrawBorder (iTextSharp.text.pdf.PdfContentByte contentByte, iTextSharp.text.Rectangle rectangle, - ICSharpCode.Reports.Core.old_Exporter.IBaseStyleDecorator style) + ICSharpCode.Reports.Core.Exporter.IBaseStyleDecorator style) { if ( contentByte == null) { throw new ArgumentNullException("contentByte"); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/EllipseShape.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/EllipseShape.cs index 356f0f4585..c541cf7b08 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/EllipseShape.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/EllipseShape.cs @@ -7,7 +7,7 @@ using System; using System.Drawing; using System.Drawing.Drawing2D; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; /// /// This class draws a Ellipse/Ellipse diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/LineShape.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/LineShape.cs index 10bc11c5d2..7293da6330 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/LineShape.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/LineShape.cs @@ -10,7 +10,7 @@ using System; using System.Drawing; using System.Drawing.Drawing2D; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; /// /// Draw a simple Line diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/RectangleShape.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/RectangleShape.cs index 0f83345a82..286a4e90ed 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/RectangleShape.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/RectangleShape.cs @@ -10,7 +10,7 @@ using System; using System.Drawing; using System.Drawing.Drawing2D; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; /// /// Draw a Rectangle, used by DesingerControls and printing stuff diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs index aa4e05d158..30336cbd4b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs @@ -15,7 +15,7 @@ using System.Xml; using ICSharpCode.Reports.Core.BaseClasses.Printing; using ICSharpCode.Reports.Core.Interfaces; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; /// /// This Class contains the basic Functions to handle reports diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/PageNavigationEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/PageNavigationEventArgs.cs index c4598f6204..510b690383 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/PageNavigationEventArgs.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/PageNavigationEventArgs.cs @@ -7,7 +7,7 @@ using System; using ICSharpCode.Reports.Core; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; namespace ICSharpCode.Reports.Core.ReportViewer { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs index b3f7d0091d..64d66a354c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs @@ -16,8 +16,8 @@ using System.Windows.Forms; using ICSharpCode.Reports.Core.BaseClasses.Printing; using ICSharpCode.Reports.Core.Interfaces; -using ICSharpCode.Reports.Core.old_Exporter; -using ICSharpCode.Reports.Core.old_Exporter.ExportRenderer; +using ICSharpCode.Reports.Core.Exporter; +using ICSharpCode.Reports.Core.Exporter.ExportRenderer; namespace ICSharpCode.Reports.Core.ReportViewer { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/BasePager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/BasePager.cs index 909428fe14..2294f41770 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/BasePager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/BasePager.cs @@ -13,7 +13,7 @@ using ICSharpCode.Reports.Core.BaseClasses.Printing; using ICSharpCode.Reports.Core.Interfaces; using ICSharpCode.Reports.Expressions.ReportingLanguage; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of BasePager. diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/BaseConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/BaseConverter.cs index f78e33c518..434e040b89 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/BaseConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/BaseConverter.cs @@ -13,7 +13,7 @@ using ICSharpCode.Reports.Core.Events; using ICSharpCode.Reports.Core.Interfaces; using ICSharpCode.Reports.Expressions.ReportingLanguage; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/ConverterFactory.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/ConverterFactory.cs index 63b1d2a9bc..4a693f2e1c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/ConverterFactory.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/ConverterFactory.cs @@ -10,7 +10,7 @@ using System; using System.Drawing; using ICSharpCode.Reports.Core.Interfaces; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of ConverterFactory. diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/RowConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/RowConverter.cs index d7bbebafe1..f323dcc80c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/RowConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/RowConverter.cs @@ -13,7 +13,7 @@ using System.Drawing; using ICSharpCode.Reports.Core.BaseClasses.Printing; using ICSharpCode.Reports.Core.Interfaces; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of RowConverter. diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/TableConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/TableConverter.cs index 0d463f7039..7015a79d8d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/TableConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/TableConverter.cs @@ -11,7 +11,7 @@ using System.Drawing; using ICSharpCode.Reports.Core.BaseClasses.Printing; using ICSharpCode.Reports.Core.Interfaces; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of TableConverter. diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/DataPageBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/DataPageBuilder.cs index d940db1433..db76ed6658 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/DataPageBuilder.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/DataPageBuilder.cs @@ -11,7 +11,7 @@ using ICSharpCode.Reports.Core.BaseClasses.Printing; using ICSharpCode.Reports.Core.Events; using ICSharpCode.Reports.Core.Interfaces; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { public class DataPageBuilder:BasePager { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/BaseStyleDecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/BaseStyleDecorator.cs index 95ccc5238b..f8b58c212a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/BaseStyleDecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/BaseStyleDecorator.cs @@ -8,7 +8,7 @@ using System; using System.Drawing; using System.Drawing.Drawing2D; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of LineStyle. @@ -56,11 +56,6 @@ namespace ICSharpCode.Reports.Core.old_Exporter } -// public Rectangle DisplayRectangle { -// get { -// return new Rectangle(Location,Size); -// } -// } private static iTextSharp.text.BaseColor ConvertToPdfBaseColor (Color color) { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/GraphicStyleDecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/GraphicStyleDecorator.cs index 1da5f8d10c..eca76ab597 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/GraphicStyleDecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/GraphicStyleDecorator.cs @@ -8,7 +8,7 @@ using System; using System.Drawing; using System.Drawing.Drawing2D; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of GraphicStyleDecorator. diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/IBaseStyleDecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/IBaseStyleDecorator.cs index 5c4764e795..fd2490e17c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/IBaseStyleDecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/IBaseStyleDecorator.cs @@ -8,7 +8,7 @@ using System; using System.Drawing; using System.Drawing.Drawing2D; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { public interface IBaseStyleDecorator { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/ILineDecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/ILineDecorator.cs index 5581e72a53..9ed906ebf4 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/ILineDecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/ILineDecorator.cs @@ -10,7 +10,7 @@ using System; using System.Drawing; using System.Drawing.Drawing2D; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { public interface ILineDecorator { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/Linedecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/Linedecorator.cs index 74329c160d..bd426be199 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/Linedecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/Linedecorator.cs @@ -10,7 +10,7 @@ using System; using System.Drawing; using System.Drawing.Drawing2D; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { public class LineDecorator : GraphicStyleDecorator, ILineDecorator { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/TextStyleDecorator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/TextStyleDecorator.cs index 1eef5904a8..90fc5749a3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/TextStyleDecorator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/TextStyleDecorator.cs @@ -8,7 +8,7 @@ using System; using System.Drawing; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of TextStyleDecorator. diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/BaseExportColumn.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/BaseExportColumn.cs index 3dde415939..a1099c0cff 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/BaseExportColumn.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/BaseExportColumn.cs @@ -10,7 +10,7 @@ using System.Drawing; using iTextSharp.text.pdf; using ICSharpCode.Reports.Core.BaseClasses.Printing; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of BaseLineItem. @@ -20,7 +20,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter private IBaseStyleDecorator styleDecorator; private bool isContainer; - private ICSharpCode.Reports.Core.old_Exporter.ExportRenderer.PdfUnitConverter converter; + private ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter; private PdfWriter pdfWriter; #region Constructors @@ -49,7 +49,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter public virtual void DrawItem (PdfWriter pdfWriter, - ICSharpCode.Reports.Core.old_Exporter.ExportRenderer.PdfUnitConverter converter) + ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter) { if (pdfWriter == null) { throw new ArgumentNullException("pdfWriter"); @@ -180,7 +180,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter } } - public ICSharpCode.Reports.Core.old_Exporter.ExportRenderer.PdfUnitConverter PdfUnitConverter { + public ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter PdfUnitConverter { get { return converter; } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportContainer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportContainer.cs index 0dceb3e65c..b5d37b9ea8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportContainer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportContainer.cs @@ -9,7 +9,7 @@ using System; using System.Drawing; using iTextSharp.text.pdf; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of ContainerItem. @@ -44,7 +44,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter base.Decorate(graphics); } - public override void DrawItem(PdfWriter pdfWriter, ICSharpCode.Reports.Core.old_Exporter.ExportRenderer.PdfUnitConverter converter) + public override void DrawItem(PdfWriter pdfWriter, ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter) { base.DrawItem(pdfWriter, converter); base.Decorate(); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportGraphic.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportGraphic.cs index 519dc2aa08..09e2333654 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportGraphic.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportGraphic.cs @@ -9,7 +9,7 @@ using System; using System.Drawing; using iTextSharp.text; using iTextSharp.text.pdf; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of ExportGraphic. @@ -102,7 +102,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter public override void DrawItem(PdfWriter pdfWriter, - ICSharpCode.Reports.Core.old_Exporter.ExportRenderer.PdfUnitConverter converter) + ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter) { base.DrawItem(pdfWriter, converter); ILineDecorator lineDecorator = base.StyleDecorator as LineDecorator; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportImage.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportImage.cs index ccef0a5547..fb2ccdbd0d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportImage.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportImage.cs @@ -10,7 +10,7 @@ using System.Drawing; using iTextSharp.text; using iTextSharp.text.pdf; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of ExportImage. @@ -56,7 +56,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter } public override void DrawItem(iTextSharp.text.pdf.PdfWriter pdfWriter, - ICSharpCode.Reports.Core.old_Exporter.ExportRenderer.PdfUnitConverter converter) + ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter) { base.DrawItem(pdfWriter, converter); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportText.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportText.cs index 44b2206dab..12edeb2a5f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportText.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportText.cs @@ -11,7 +11,7 @@ using ICSharpCode.Reports.Core.BaseClasses.Printing; using iTextSharp.text; using iTextSharp.text.pdf; -namespace ICSharpCode.Reports.Core.old_Exporter { +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of LineItem. /// @@ -33,7 +33,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter { public override void DrawItem(PdfWriter pdfWriter, - ICSharpCode.Reports.Core.old_Exporter.ExportRenderer.PdfUnitConverter converter) + ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter) { if (pdfWriter == null) { throw new ArgumentNullException("pdfWriter"); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/IExportColumnBuilder .cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/IExportColumnBuilder .cs index 90f437c440..b2e5059a3c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/IExportColumnBuilder .cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/IExportColumnBuilder .cs @@ -7,7 +7,7 @@ using System; using System.Drawing; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; namespace ICSharpCode.Reports.Core { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/IExportContainer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/IExportContainer.cs index 6c00bf1b0b..89a01c1e87 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/IExportContainer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/IExportContainer.cs @@ -8,12 +8,12 @@ using System; using iTextSharp.text.pdf; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { public interface IExportContainer { void DrawItem(System.Drawing.Graphics graphics); - void DrawItem(PdfWriter pdfWriter, ICSharpCode.Reports.Core.old_Exporter.ExportRenderer.PdfUnitConverter converter); + void DrawItem(PdfWriter pdfWriter, ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter); // void AddLineItem(BaseExportColumn item); ExporterCollection Items { get; } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportItemsConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportItemsConverter.cs index 8e173b5889..a28023a823 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportItemsConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportItemsConverter.cs @@ -10,7 +10,7 @@ using System.Drawing; using ICSharpCode.Reports.Core.BaseClasses.Printing; using ICSharpCode.Reports.Core.Interfaces; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /* public class ExportItemsConverter:IExportItemsConverter diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/BaseExportRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/BaseExportRenderer.cs index 4f8bb7a715..ff5b59256a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/BaseExportRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/BaseExportRenderer.cs @@ -8,7 +8,7 @@ using System; using System.Drawing; -namespace ICSharpCode.Reports.Core.old_Exporter.ExportRenderer{ +namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{ /// /// Description of BaseExportRenderer. @@ -31,7 +31,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter.ExportRenderer{ protected static void DrawItems (Graphics graphics,ExporterCollection items) { - foreach (ICSharpCode.Reports.Core.old_Exporter.BaseExportColumn baseExportColumn in items) { + foreach (ICSharpCode.Reports.Core.Exporter.BaseExportColumn baseExportColumn in items) { if (baseExportColumn != null) { ExportContainer container = baseExportColumn as ExportContainer; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/HTMLRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/HTMLRenderer.cs index f4e0ee5da0..c739d8a306 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/HTMLRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/HTMLRenderer.cs @@ -9,7 +9,7 @@ using System; -namespace ICSharpCode.Reports.Core.old_Exporter.ExportRenderer +namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer { /// /// Description of HTMLRenderer. diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PdfRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PdfRenderer.cs index f2db4f13be..0f6627784e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PdfRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PdfRenderer.cs @@ -15,7 +15,7 @@ using iTextSharp.text.pdf; using iTextSharp.text.factories; -namespace ICSharpCode.Reports.Core.old_Exporter.ExportRenderer +namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer { /// /// Description of Pdf2Renderer. @@ -107,7 +107,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter.ExportRenderer private void DrawPage (ExporterCollection items) { - foreach (ICSharpCode.Reports.Core.old_Exporter.BaseExportColumn baseExportColumn in items) { + foreach (ICSharpCode.Reports.Core.Exporter.BaseExportColumn baseExportColumn in items) { if (baseExportColumn != null) { IExportContainer container = baseExportColumn as ExportContainer; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PreviewRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PreviewRenderer.cs index 42829dada3..f15d47246b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PreviewRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PreviewRenderer.cs @@ -8,7 +8,7 @@ using System; using System.Drawing; -namespace ICSharpCode.Reports.Core.old_Exporter.ExportRenderer +namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer { /// /// Description of StandartRenderer. diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PrintRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PrintRenderer.cs index 237a7e7531..1806bfa24a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PrintRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/PrintRenderer.cs @@ -9,7 +9,7 @@ using System; using System.Drawing; using System.Drawing.Printing; -namespace ICSharpCode.Reports.Core.old_Exporter.ExportRenderer{ +namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer{ /// /// Description of PrintRenderer. /// diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/XPSRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/XPSRenderer.cs index 65b25bebf8..6c6591505b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/XPSRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportRenderer/XPSRenderer.cs @@ -9,7 +9,7 @@ using System; -namespace ICSharpCode.Reports.Core.old_Exporter.ExportRenderer +namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer { /// /// Description of XPSRenderer. diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExporterPage.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExporterPage.cs index 8c9aa76e6b..c65f44705b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExporterPage.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExporterPage.cs @@ -7,7 +7,7 @@ using System; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { public class ExporterPage:SinglePage diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/FormPageBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/FormPageBuilder.cs index 9f44af8007..0441e1364e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/FormPageBuilder.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/FormPageBuilder.cs @@ -11,7 +11,7 @@ using ICSharpCode.Reports.Core.Interfaces; using System; using System.Drawing; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of FormPageBuilder. diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/PageEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/PageEventArgs.cs index 54ebd82e93..b4b33d98b7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/PageEventArgs.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/PageEventArgs.cs @@ -7,7 +7,7 @@ using System; -namespace ICSharpCode.Reports.Core.old_Exporter +namespace ICSharpCode.Reports.Core.Exporter { /// /// Description of PageCreatedEventArgs. diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseDataItemFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseDataItemFixture.cs index 75e04aa2dd..5686526f52 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseDataItemFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseDataItemFixture.cs @@ -8,7 +8,7 @@ */ using System; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; using NUnit.Framework; namespace ICSharpCode.Reports.Core.Test.BaseItems diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseGraphicItemFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseGraphicItemFixture.cs index 6f3be82b6b..fa93d1c169 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseGraphicItemFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseGraphicItemFixture.cs @@ -9,7 +9,7 @@ using System; using NUnit.Framework; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; namespace ICSharpCode.Reports.Core.Test.BaseItems { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseRowItemFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseRowItemFixture.cs index 0aacdd215c..bab47f0af5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseRowItemFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseRowItemFixture.cs @@ -8,7 +8,7 @@ */ using System; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; using NUnit.Framework; namespace ICSharpCode.Reports.Core.Test.BaseItems diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseTextItemFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseTextItemFixture.cs index e25ac21c14..11eee4dd5b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseTextItemFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseTextItemFixture.cs @@ -11,7 +11,7 @@ using System; using System.Drawing; using NUnit.Framework; using ICSharpCode.Reports.Core; -using ICSharpCode.Reports.Core.old_Exporter; +using ICSharpCode.Reports.Core.Exporter; namespace ICSharpCode.Reports.Core.Test.BaseItems { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/AbstractExportListBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/AbstractExportListBuilder.cs deleted file mode 100644 index 7bcaf4dfb5..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/AbstractExportListBuilder.cs +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 24.05.2010 - * Time: 19:52 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -using System; - -namespace ICSharpCode.Reports.Core.Test.Exporter -{ - /// - /// Description of AbstractExportListBuilder. - /// - /* - public class AbstractExportListBuilder - { - public AbstractExportListBuilder() - { - } - } - */ -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/Converter/ItemsConverterFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/Converter/ItemsConverterFixture.cs deleted file mode 100644 index 35e5aa16de..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/Converter/ItemsConverterFixture.cs +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 21.05.2010 - * Time: 19:44 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ - -using System; -using System.Collections.Generic; -using System.Drawing; -using ICSharpCode.Reports.Core.Exporter.Converter; -using ICSharpCode.Reports.Core.Test.TestHelpers; -using NUnit.Framework; - -namespace ICSharpCode.Reports.Core.Test.Exporter.Converter -{ - [TestFixture] - public class ItemsConverterFixture:ConcernOf - { - [Test] - public void ConvertSimpleItem() - { - BaseSection section = new BaseSection(); - section.Items.Add(CreateSimpeTextItem()); - Point point = new Point(1,1); - ReportItemCollection result = Sut.Convert (section,section.Items); - - Assert.AreEqual(new Point(section.Size.Width,section.Size.Height),Sut.LocationAfterConvert); - Assert.AreEqual(1,result.Count); - - } - - [Test] - public void Check_Location_Of_Item_In_Section () - { - BaseSection section = new BaseSection(); - section.Location = new Point (10,10); - - var textItem = CreateSimpeTextItem(); - section.Items.Add(textItem); - - Point checkPoint = new Point(section.Location.X + textItem.Location.X,section.Location.Y + textItem.Location.Y); - - ReportItemCollection result = Sut.Convert (section,section.Items); - var checkItem = result[0]; - - Assert.AreEqual(checkPoint,checkItem.Location); - } - - - [Test] - public void Check_Location_After_Convert () - { - BaseSection section = new BaseSection(); - section.Location = new Point (10,10); - - var textItem = CreateSimpeTextItem(); - section.Items.Add(textItem); - - Point checkPoint = new Point(section.Location.X + section.Size.Width,section.Location.Y + section.Size.Height); - - ReportItemCollection result = Sut.Convert (section,section.Items); - - Assert.AreEqual(checkPoint,Sut.LocationAfterConvert); - } - - - private BaseReportItem CreateSimpeTextItem () - { - BaseTextItem bt = new BaseTextItem(); - bt.Location = new Point(10,10); - bt.Text = "MyText"; - return bt; - } - - - public override void Setup() - { - Sut = new ItemsConverter(); - } - - - - [TestFixtureSetUp] - public void Init() - { - // TODO: Add Init code. - } - - [TestFixtureTearDown] - public void Dispose() - { - // TODO: Add tear down code. - } - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/DataListBuilderFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/DataListBuilderFixture.cs deleted file mode 100644 index 1af402a220..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/DataListBuilderFixture.cs +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 15.05.2010 - * Time: 18:29 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ - -using System; -using System.Drawing; -using ICSharpCode.Reports.Core.Exporter; -using ICSharpCode.Reports.Core.Exporter.Converter; -using ICSharpCode.Reports.Core.Interfaces; -using ICSharpCode.Reports.Core.Project.Interfaces; -using ICSharpCode.Reports.Core.Test.TestHelpers; -using NUnit.Framework; - -namespace ICSharpCode.Reports.Core.Test.Exporter -{ - [TestFixture] - public class DataListBuilderFixture:ConcernOf - { - ReportModel reportModel; - - [Test] - public void Can_Create_ExportListBuilder() - { - ReportSettings rs = new ReportSettings(); - rs.ConnectionString = "goodConnection"; - - IDataAccessStrategy da = new MockDataAccessStrategy (rs); - IDataManager dataManager = ICSharpCode.Reports.Core.DataManager.CreateInstance(rs,da); - - var reportModel = ReportModel.Create(); - - DataExportListBuilder sut = new DataExportListBuilder(reportModel,dataManager); - Assert.IsNotNull(sut); - IDataNavigator n = sut.DataManager.GetNavigator; - Assert.AreEqual(0,sut.DataManager.GetNavigator.CurrentRow); - } - - #region Render empty ReportModel - - [Test] - public void PagesCollection_Should_Be_Not_Null() - { - Sut.WritePages(); - Assert.IsNotNull(Sut.Pages); - Assert.AreEqual(1,Sut.Pages.Count); - - } - - - - [Test] - public void PageNumber_Should_Be_One() - { - Sut.WritePages(); - Assert.AreEqual(1,Sut.Pages.Count); - Assert.AreEqual(1,Sut.Pages[0].PageNumber); - } - - - #endregion - - #region Events - - [Test] - public void SectionRenderingEvent_Should_Fire() - { - - bool eventFired = false; - Sut.SectionRendering += delegate { { eventFired = true;}}; - Sut.WritePages(); - Assert.IsTrue(eventFired); - } - - [Test] - public void PageCreatedEvent_Should_Fire () - { - bool eventFired = false; - Sut.PageCreated += delegate { { eventFired = true;}}; - Sut.WritePages(); - - Assert.IsTrue(eventFired); - } - - - [Test] - public void Every_Section_Should_Fire_Event() - { - int noOfEvents = 0; - int noOfsections = 5; - Sut.SectionRendering += delegate { { noOfEvents ++;}}; - Sut.WritePages(); - Assert.AreEqual(noOfsections,noOfEvents); - } - - #endregion - - - #region Location after rendering - - [Test] - public void Location_After_Render_Empty_Section() - { - Sut.WritePages(); - BaseSection section = reportModel.ReportHeader; - Point retVal = new Point (section.Location.X + section.Size.Width,section.Location.Y + section.Size.Height); - Assert.AreEqual(retVal.Y,Sut.PositionAfterRenderSection.Y); - } - - - [Test] - public void Add_One_Item_In_ReportHeader() - { - var item = CreateSimpeTextItem(); - reportModel.ReportHeader.Items.Add(item); - Sut.WritePages(); - BaseReportItem it = Sut.Pages[0].Items[0]; - Assert.IsNotNull(it); - Assert.AreEqual(1,Sut.Pages[0].Items.Count); - } - - - [Test] - public void Add_Container_In_ReportHeader() - { - BaseRowItem row = new BaseRowItem() { - Location = new Point (5,5) - }; - row.Items.Add(CreateSimpeTextItem()); - - reportModel.ReportHeader.Items.Add(row); - Sut.WritePages(); - - - var item = Sut.Pages[0].Items[0]; - Assert.IsAssignableFrom(typeof(BaseRowItem),item,"10"); - Assert.AreEqual(1,((BaseRowItem)item).Items.Count,"20"); - - var textItem = ((BaseRowItem)item).Items[0]; - Assert.IsAssignableFrom(typeof(BaseTextItem),textItem,"30"); - - } - - #endregion - - - private BaseReportItem CreateSimpeTextItem () - { - BaseTextItem bt = new BaseTextItem(); - bt.Text = "MyText"; - return bt; - } - - public override void Setup() - { - ReportSettings rs = new ReportSettings(); - rs.ConnectionString = "goodConnection"; - - IDataAccessStrategy da = new MockDataAccessStrategy (rs); - IDataManager dataManager = ICSharpCode.Reports.Core.DataManager.CreateInstance(rs,da); - - reportModel = ReportModel.Create(); - var itemsConverter = new ItemsConverter(); - - Sut = new DataExportListBuilder(reportModel,dataManager,itemsConverter); - } - - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/DataPageBuilderFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/DataPageBuilderFixture.cs deleted file mode 100644 index 1459a1924c..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Exporter/DataPageBuilderFixture.cs +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 14.05.2010 - * Time: 20:04 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ - -using System; -using System.Data; -using ICSharpCode.Reports.Core.BaseClasses.Printing; -using ICSharpCode.Reports.Core.Exporter; -using ICSharpCode.Reports.Core.Interfaces; -using ICSharpCode.Reports.Core.Project.Interfaces; -using ICSharpCode.Reports.Core.Test.TestHelpers; -using NUnit.Framework; - -namespace ICSharpCode.Reports.Core.Test.Exporter -{ - [TestFixture] - public class DataPageBuilderFixture:ConcernOf - { - - IReportModel reportModel; - - - [Test] - public void Can_Create_DataReportCreator() - { - - ReportSettings rs = new ReportSettings(); - rs.ConnectionString = "goodConnection"; - - IDataAccessStrategy da = new MockDataAccessStrategy (rs); - IDataManager dataManager = ICSharpCode.Reports.Core.DataManager.CreateInstance(rs,da); - - ILayouter layouter = new Layouter(); - IReportCreator_2 sut = DataReportCreator.CreateInstance(reportModel,dataManager,layouter); - Assert.IsNotNull(sut); - } - - - [Test] - public void Empty_ReportModel_Should_Return_Empty_List() - { - Sut.BuildExportList(); - Assert.AreEqual(1,Sut.Pages.Count); - } - - - public override void Setup() - { - reportModel = ReportModel.Create(); - ILayouter layouter = new Layouter(); - - ReportSettings rs = new ReportSettings(); - rs.ConnectionString = "goodConnection"; - - IDataAccessStrategy da = new MockDataAccessStrategy (rs); - - IDataManager dataManager = ICSharpCode.Reports.Core.DataManager.CreateInstance(rs,da); - - Sut = DataReportCreator.CreateInstance(reportModel,dataManager,layouter); - } - - [TestFixtureSetUp] - public void Init() - { - // TODO: Add Init code. - } - - [TestFixtureTearDown] - public void Dispose() - { - // TODO: Add tear down code. - } - } - - - public class MockDataAccessStrategy:IDataAccessStrategy - { - ReportSettings reportSettings; - - public MockDataAccessStrategy(ReportSettings reportSettings) - { - this.reportSettings = reportSettings; - } - - - - public bool OpenConnection () - { - - if (String.IsNullOrEmpty(reportSettings.ConnectionString)) { - throw new ArgumentNullException("ConnectionString"); - } - - if (reportSettings.ConnectionString == "bad") { - throw new ArgumentException(); - } - return true; - } - - public System.Data.DataSet ReadData() - { - ContributorsList contributorsList = new ContributorsList(); - DataSet ds = new DataSet(); - ds.Tables.Add(contributorsList.ContributorTable); - return ds; - } - - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ICSharpCode.Reports.Core.Test.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ICSharpCode.Reports.Core.Test.csproj index 8a8fbd5324..e019ddf04c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ICSharpCode.Reports.Core.Test.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ICSharpCode.Reports.Core.Test.csproj @@ -76,10 +76,6 @@ - - - - @@ -121,12 +117,10 @@ - -