From abf3efabef4d239ee9cd97f3d948e7915cc7a13b Mon Sep 17 00:00:00 2001 From: peterforstmeier Date: Mon, 15 Nov 2010 20:14:21 +0100 Subject: [PATCH] Cleanup - FxCop --- .../Project/DataManager/ChildNavigator.cs | 13 ++-- .../Exporter/Converters/BaseConverter.cs | 65 +++++++------------ .../Converters/GroupedRowConverter.cs | 5 +- .../Converters/GroupedTableConverter.cs | 12 ++-- 4 files changed, 37 insertions(+), 58 deletions(-) diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs index f9d830b600..7d20b2e364 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs @@ -13,7 +13,7 @@ namespace ICSharpCode.Reports.Core { private IndexList indexList; private IDataViewStrategy store; - private System.Collections.Generic.List.Enumerator genEnumerator; + private System.Collections.Generic.List.Enumerator enumerator; public ChildNavigator(IDataViewStrategy dataStore,IndexList indexList) { @@ -22,8 +22,8 @@ namespace ICSharpCode.Reports.Core } this.store = dataStore; this.indexList = indexList; - genEnumerator = this.indexList.GetEnumerator(); - genEnumerator.MoveNext(); + enumerator = this.indexList.GetEnumerator(); + enumerator.MoveNext(); } @@ -71,7 +71,7 @@ namespace ICSharpCode.Reports.Core public object Current { get { TableStrategy t = this.store as TableStrategy; - return t.myCurrent(genEnumerator.Current.ListIndex); + return t.myCurrent(enumerator.Current.ListIndex); } } @@ -125,11 +125,6 @@ namespace ICSharpCode.Reports.Core } - public void FillChild(ReportItemCollection collection) - { - throw new NotImplementedException(); - } - private IndexList BuildChildList() { GroupComparer gc = this.indexList[this.indexList.CurrentPosition] as GroupComparer; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs index 90445c1377..062378af1d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs @@ -22,11 +22,6 @@ namespace ICSharpCode.Reports.Core.Exporter public class BaseConverter:IBaseConverter { - private IDataNavigator dataNavigator; - private ExporterPage singlePage; - private SectionBounds sectionBounds; - private Rectangle parentRectangle; - private ILayouter layouter; private Size saveSize; private IExpressionEvaluatorFacade evaluator; @@ -49,11 +44,11 @@ namespace ICSharpCode.Reports.Core.Exporter if (layouter == null) { throw new ArgumentNullException("layouter"); } - this.singlePage = singlePage; - this.dataNavigator = dataNavigator; - this.sectionBounds = this.singlePage.SectionBounds; - this.layouter = layouter; - this.evaluator = StandardPrinter.CreateEvaluator(this.singlePage,this.dataNavigator); + this.SinglePage = singlePage; + this.DataNavigator = dataNavigator; + SectionBounds = this.SinglePage.SectionBounds; + this.Layouter = layouter; + this.Evaluator = StandardPrinter.CreateEvaluator(this.SinglePage,this.DataNavigator); } @@ -75,6 +70,8 @@ namespace ICSharpCode.Reports.Core.Exporter #endregion + #region Events + protected void FireRowRendering (ISimpleContainer detailRow) { BaseRowItem row = detailRow as BaseRowItem; @@ -104,11 +101,12 @@ namespace ICSharpCode.Reports.Core.Exporter { SectionRenderEventArgs srea = new SectionRenderEventArgs(section, this.SinglePage.PageNumber, - this.dataNavigator.CurrentRow, + this.DataNavigator.CurrentRow, section); EventHelper.Raise(SectionRendering,this,srea); } + #endregion protected static ExporterCollection ConvertItems (ISimpleContainer row,Point offset) @@ -151,12 +149,12 @@ namespace ICSharpCode.Reports.Core.Exporter PrepareContainerForConverting(section,simpleContainer); FireRowRendering(simpleContainer); Point curPos = BaseConvert(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition); - AfterConverting (section,mylist); + AfterConverting (mylist); return curPos; } - protected void PageBreakAfterGroupChange(BaseSection section,ISimpleContainer container,ExporterCollection exporterCollection) + protected void PageBreakAfterGroupChange(BaseSection section,ExporterCollection exporterCollection) { if (CheckPageBreakAfterGroupChange(section) ) { @@ -169,7 +167,7 @@ namespace ICSharpCode.Reports.Core.Exporter } - private bool CheckPageBreakAfterGroupChange(ISimpleContainer container) + private static bool CheckPageBreakAfterGroupChange(ISimpleContainer container) { var groupedRows = BaseConverter.FindGroupHeader(container); if (groupedRows.Count > 0) { @@ -204,7 +202,7 @@ namespace ICSharpCode.Reports.Core.Exporter public virtual ExporterCollection Convert(BaseReportItem parent, BaseReportItem item) { - this.parentRectangle = new Rectangle(parent.Location,parent.Size); + this.ParentRectangle = new Rectangle(parent.Location,parent.Size); return new ExporterCollection();; } @@ -212,31 +210,25 @@ namespace ICSharpCode.Reports.Core.Exporter #endregion - public Rectangle ParentRectangle { - get { return parentRectangle; } - } + public Rectangle ParentRectangle {get;private set;} + + public ISinglePage SinglePage {get;private set;} + public SectionBounds SectionBounds {get; private set;} - public ISinglePage SinglePage { - get { return singlePage; } - } + public IDataNavigator DataNavigator {get;private set;} + - public SectionBounds SectionBounds { - get { return sectionBounds; } - } + public ILayouter Layouter {get; private set;} - public IDataNavigator DataNavigator { - get { return dataNavigator; } - } + public Graphics Graphics {get;set;} - public ILayouter Layouter { - get { return layouter; } - } - public Graphics Graphics {get;set;} + protected IExpressionEvaluatorFacade Evaluator{get;private set;} + protected int DefaultLeftPosition {get;set;} protected void SaveSectionSize(Size size) @@ -251,13 +243,6 @@ namespace ICSharpCode.Reports.Core.Exporter } - protected IExpressionEvaluatorFacade Evaluator - { - get {return this.evaluator;} - } - - protected int DefaultLeftPosition {get;set;} - protected void PrepareContainerForConverting(BaseSection section,ISimpleContainer simpleContainer) { FireSectionRendering(section); @@ -265,7 +250,7 @@ namespace ICSharpCode.Reports.Core.Exporter } - protected void AfterConverting (BaseSection section,ExporterCollection convertedList) + protected void AfterConverting (ExporterCollection convertedList) { StandardPrinter.EvaluateRow(Evaluator,convertedList); } @@ -278,7 +263,7 @@ namespace ICSharpCode.Reports.Core.Exporter FillRow(simpleContainer); PrepareContainerForConverting(section,simpleContainer); Point curPos = BaseConvert(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition); - AfterConverting (section,mylist); + AfterConverting (mylist); simpleContainer.Size = rowSize; return curPos; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs index 9c6308a4f9..82c1d4ef25 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs @@ -70,7 +70,6 @@ namespace ICSharpCode.Reports.Core.Exporter childSize = section.Items[1].Size; } - Rectangle pageBreakRect = Rectangle.Empty; do { base.SaveSectionSize(section.Size); @@ -115,7 +114,7 @@ namespace ICSharpCode.Reports.Core.Exporter // GroupFooter base.ConvertGroupFooter(section,section,exporterCollection); - base.PageBreakAfterGroupChange(section,section,exporterCollection); + base.PageBreakAfterGroupChange(section,exporterCollection); base.Evaluator.SinglePage.IDataNavigator = base.DataNavigator; } @@ -183,7 +182,7 @@ namespace ICSharpCode.Reports.Core.Exporter StandardPrinter.EvaluateRow(base.Evaluator,list); exportList.AddRange(list); - AfterConverting (section,list); + AfterConverting (list); retVal = new Point (DefaultLeftPosition,offset.Y + groupCollection[0].Size.Height + 20 + (3 *GlobalValues.GapBetweenContainer)); } else { base.FireGroupHeaderRendering(groupedRows[0]); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs index 94dbaca8f8..235cc02ba7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs @@ -49,14 +49,14 @@ namespace ICSharpCode.Reports.Core.Exporter BaseSection section = table.Parent as BaseSection; + ISimpleContainer headerRow = null; + Point dataAreaStart = new Point(table.Items[0].Location.X,table.Items[0].Location.Y + base.CurrentPosition.Y); + base.CurrentPosition = new Point(PrintHelper.DrawingAreaRelativeToParent(this.table.Parent,this.table).Location.X, base.SectionBounds.DetailStart.Y); -// int defaultLeftPos = base.CurrentPosition.X; + base.DefaultLeftPosition = base.CurrentPosition.X; - Point dataAreaStart = new Point(table.Items[0].Location.X,table.Items[0].Location.Y + base.CurrentPosition.Y); - ISimpleContainer headerRow = null; - Rectangle pageBreakRect = Rectangle.Empty; this.table.Items.SortByLocation(); // Header @@ -115,7 +115,7 @@ namespace ICSharpCode.Reports.Core.Exporter // GroupFooter base.ConvertGroupFooter(section,table,exporterCollection); - base.PageBreakAfterGroupChange(section,table,exporterCollection); + base.PageBreakAfterGroupChange(section,exporterCollection); base.Evaluator.SinglePage.IDataNavigator = base.DataNavigator; } @@ -198,7 +198,7 @@ namespace ICSharpCode.Reports.Core.Exporter StandardPrinter.EvaluateRow(base.Evaluator,list); exportList.AddRange(list); - AfterConverting (section,list); + AfterConverting (list); retVal = new Point (base.DefaultLeftPosition,offset.Y + groupCollection[0].Size.Height + 20 + (3 *GlobalValues.GapBetweenContainer));