From 7d42a1dac20156b64de973b7d477bf45233dd19d Mon Sep 17 00:00:00 2001 From: peterforstmeier Date: Mon, 13 Dec 2010 20:03:16 +0100 Subject: [PATCH] Cleanup --- .../Project/ReportDesignerView.cs | 15 ++++------ .../ICSharpCode.Reports.Core.csproj | 1 - .../Project/Collections/Collections.cs | 1 - .../ListStrategy/BaseListStrategy.cs | 4 +-- .../Project/Exporter/BasePager.cs | 11 ++++--- .../Project/Exporter/DataPageBuilder.cs | 11 +++---- .../Project/Exporter/FormPageBuilder.cs | 7 ++--- .../Interfaces/IHierarchyInterfaces.cs | 30 ------------------- .../Project/ReportEngine.cs | 14 ++++----- .../Project/ReportViewer/ReportViewer.cs | 9 ++---- 10 files changed, 28 insertions(+), 75 deletions(-) delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs index 3fd44c3a72..2ae69f4f10 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs @@ -570,29 +570,26 @@ namespace ICSharpCode.Reports.Addin get { ReportModel model = loader.CreateRenderableModel(); IReportCreator reportCreator = null; - Layouter layouter = new Layouter(); - var c = new CollectParametersCommand(model); - c.Run(); + var paramCmd = new CollectParametersCommand(model); + paramCmd.Run(); switch (model.DataModel) { case GlobalEnums.PushPullModel.FormSheet : { - reportCreator = FormPageBuilder.CreateInstance(model,layouter); + reportCreator = FormPageBuilder.CreateInstance(model); break; } case GlobalEnums.PushPullModel.PullData: { - IDataManager dataManager = DataManagerFactory.CreateDataManager(model,(ReportParameters)null); - reportCreator = DataPageBuilder.CreateInstance(model,dataManager,layouter); + reportCreator = DataPageBuilder.CreateInstance(model,dataManager); break; } case GlobalEnums.PushPullModel.PushData:{ - ICSharpCode.Reports.Addin.Commands.DataSetFromXsdCommand cmd = - new ICSharpCode.Reports.Addin.Commands.DataSetFromXsdCommand(); + var cmd = new ICSharpCode.Reports.Addin.Commands.DataSetFromXsdCommand(); cmd.Run(); DataSet ds = cmd.DataSet; IDataManager dataManager = DataManagerFactory.CreateDataManager(model,ds.Tables[0]); - reportCreator = DataPageBuilder.CreateInstance(model,dataManager,layouter); + reportCreator = DataPageBuilder.CreateInstance(model,dataManager); break; } default: 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 e3d4cc16d1..264bb5786e 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 @@ -252,7 +252,6 @@ - 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 84e8a66302..710b951c4d 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 @@ -143,7 +143,6 @@ namespace ICSharpCode.Reports.Core{ protected override void RemoveItem(int index) { - BaseReportItem item = this[index]; base.RemoveItem(index); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs index d7ce3cfc6b..dcc7992816 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs @@ -130,7 +130,7 @@ namespace ICSharpCode.Reports.Core { #endregion #region Debug Code - + /* protected static void ShowIndexList (IndexList list) { @@ -151,7 +151,7 @@ namespace ICSharpCode.Reports.Core { } } } - + */ #endregion public virtual void Reset() diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs index 5d28570ad0..f2b726cf33 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs @@ -27,16 +27,15 @@ namespace ICSharpCode.Reports.Core.Exporter #region Constructor - public BasePager(IReportModel reportModel,ILayouter layouter) + public BasePager(IReportModel reportModel) { if (reportModel == null) { throw new ArgumentNullException("reportModel"); } - if (layouter == null) { - throw new ArgumentNullException ("layouter"); - } + this.ReportModel = reportModel; - this.Layouter = layouter; + //this.Layouter = layouter; + this.Layouter = new Layouter(); this.Graphics = CreateGraphicObject.FromSize(this.ReportModel.ReportSettings.PageSize); } @@ -210,7 +209,7 @@ namespace ICSharpCode.Reports.Core.Exporter ExportText et = be as ExportText; if (et != null) { - if (et.Text.StartsWith("=")) { + if (et.Text.StartsWith("=",StringComparison.InvariantCulture)) { et.Text = evaluatorFassade.Evaluate(et.Text); } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs index 4fcfcb06e5..ed0a7a24ee 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs @@ -19,8 +19,8 @@ namespace ICSharpCode.Reports.Core.Exporter #region Constructor - - public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager,ILayouter layouter) + public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager) +// public static IReportCreator CreateInstance(IReportModel reportModel, IDataManager dataManager,ILayouter layouter) { if (reportModel == null) { throw new ArgumentNullException("reportModel"); @@ -28,15 +28,12 @@ namespace ICSharpCode.Reports.Core.Exporter if (dataManager == null) { throw new ArgumentNullException("dataManager"); } - if (layouter == null) { - throw new ArgumentNullException("layouter"); - } - DataPageBuilder instance = new DataPageBuilder(reportModel,dataManager,layouter); + DataPageBuilder instance = new DataPageBuilder(reportModel,dataManager); return instance; } - private DataPageBuilder (IReportModel reportModel,IDataManager dataManager,ILayouter layouter):base(reportModel,layouter) + private DataPageBuilder (IReportModel reportModel,IDataManager dataManager):base(reportModel) { this.dataManager = dataManager; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs index 4bfde611d1..63ec24a5f7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs @@ -16,18 +16,17 @@ namespace ICSharpCode.Reports.Core.Exporter #region Constructure - public static FormPageBuilder CreateInstance(IReportModel reportModel,ILayouter layouter) + public static FormPageBuilder CreateInstance(IReportModel reportModel) { if (reportModel == null) { throw new ArgumentNullException("reportModel"); } - - FormPageBuilder instance = new FormPageBuilder(reportModel,layouter); + FormPageBuilder instance = new FormPageBuilder(reportModel); return instance; } - private FormPageBuilder(IReportModel reportModel,ILayouter layouter):base(reportModel,layouter) + private FormPageBuilder(IReportModel reportModel):base(reportModel) { } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs deleted file mode 100644 index eae93ece42..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IHierarchyInterfaces.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -//ToDo with NET2.0 change this Interface to the one provided by NET2.0 -using System; - -namespace ICSharpCode.Reports.Core { - - public interface IHierarchyData{ - - IndexList GetChildren { - get; - } - - bool HasChildren { - get; - } - - object Item { - get; - } - string Path { - get; - } - - string Type { - get; - } - } -} 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 19ef6c3279..5d9957e2d6 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs @@ -469,13 +469,12 @@ namespace ICSharpCode.Reports.Core { IReportModel reportModel = LoadReportModel (fileName); IReportCreator builder = null; - Layouter layouter = new Layouter(); if (reportModel.DataModel == GlobalEnums.PushPullModel.FormSheet) { - builder = FormPageBuilder.CreateInstance(reportModel,layouter); + builder = FormPageBuilder.CreateInstance(reportModel); } else { CheckForParameters(reportModel,reportParameters); IDataManager dataMan = DataManagerFactory.CreateDataManager(reportModel,reportParameters); - builder = DataPageBuilder.CreateInstance(reportModel, dataMan,layouter); + builder = DataPageBuilder.CreateInstance(reportModel, dataMan); } return builder; } @@ -493,8 +492,7 @@ namespace ICSharpCode.Reports.Core { throw new ArgumentNullException("reportModel"); } IDataManager dataMan = DataManagerFactory.CreateDataManager(reportModel,(ReportParameters)null); - Layouter layouter = new Layouter(); - IReportCreator builder = DataPageBuilder.CreateInstance(reportModel, dataMan,layouter); + IReportCreator builder = DataPageBuilder.CreateInstance(reportModel, dataMan); return builder; } @@ -543,8 +541,7 @@ namespace ICSharpCode.Reports.Core { IDataManager dataMan = DataManager.CreateInstance(dataTable,reportModel.ReportSettings); if (dataMan != null) { - Layouter layouter = new Layouter(); - return DataPageBuilder.CreateInstance(reportModel, dataMan,layouter); + return DataPageBuilder.CreateInstance(reportModel, dataMan); } else { throw new MissingDataManagerException(); } @@ -571,8 +568,7 @@ namespace ICSharpCode.Reports.Core { ReportEngine.CheckForParameters(reportModel,reportParameters); IDataManager dataMan = DataManager.CreateInstance(list,reportModel.ReportSettings); if (dataMan != null) { - Layouter layouter = new Layouter(); - return DataPageBuilder.CreateInstance(reportModel,dataMan,layouter); + return DataPageBuilder.CreateInstance(reportModel,dataMan); } else { throw new MissingDataManagerException(); } 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 c506297df9..298990622d 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 @@ -151,9 +151,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer private void RunFormSheet (ReportModel reportModel) { - - Layouter layouter = new Layouter(); - IReportCreator reportCreator = FormPageBuilder.CreateInstance(reportModel,layouter); + IReportCreator reportCreator = FormPageBuilder.CreateInstance(reportModel); reportCreator.SectionRendering += new EventHandler(PushPrinting); reportCreator.PageCreated += OnPageCreated; reportCreator.BuildExportList(); @@ -163,8 +161,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer private void RunDataReport (ReportModel reportModel,IDataManager data) { - ILayouter layouter = new Layouter(); - IReportCreator reportCreator = DataPageBuilder.CreateInstance(reportModel,data,layouter); + IReportCreator reportCreator = DataPageBuilder.CreateInstance(reportModel,data); reportCreator.SectionRendering += new EventHandler(PushPrinting); reportCreator.GroupHeaderRendering += new EventHandler(GroupHeaderRendering); reportCreator.GroupFooterRendering += GroupFooterRendering; @@ -195,7 +192,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer private void PushPrinting (object sender,SectionRenderEventArgs e) { - string sectionName = e.Section.Name; +// string sectionName = e.Section.Name; /* if (sectionName == ReportSectionNames.ReportHeader) { Console.WriteLine("PushPrinting :" + ReportSectionNames.ReportHeader);