pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Cleanup - FxCop

pull/14/head
peterforstmeier 15 years ago
parent
b3c5f17e1e
commit
abf3efabef
4 changed files with 37 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs
  2. 65
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs
  3. 5
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs
  4. 12
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs

13
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs
Unescape View File

@ -13,7 +13,7 @@ namespace ICSharpCode.Reports.Core
{ {
private IndexList indexList; private IndexList indexList;
private IDataViewStrategy store; private IDataViewStrategy store;
private System.Collections.Generic.List<BaseComparer>.Enumerator genEnumerator; private System.Collections.Generic.List<BaseComparer>.Enumerator enumerator;
public ChildNavigator(IDataViewStrategy dataStore,IndexList indexList) public ChildNavigator(IDataViewStrategy dataStore,IndexList indexList)
{ {
@ -22,8 +22,8 @@ namespace ICSharpCode.Reports.Core
} }
this.store = dataStore; this.store = dataStore;
this.indexList = indexList; this.indexList = indexList;
genEnumerator = this.indexList.GetEnumerator(); enumerator = this.indexList.GetEnumerator();
genEnumerator.MoveNext(); enumerator.MoveNext();
} }
@ -71,7 +71,7 @@ namespace ICSharpCode.Reports.Core
public object Current { public object Current {
get { get {
TableStrategy t = this.store as TableStrategy; 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() private IndexList BuildChildList()
{ {
GroupComparer gc = this.indexList[this.indexList.CurrentPosition] as GroupComparer; GroupComparer gc = this.indexList[this.indexList.CurrentPosition] as GroupComparer;

65
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs
Unescape View File

@ -22,11 +22,6 @@ namespace ICSharpCode.Reports.Core.Exporter
public class BaseConverter:IBaseConverter public class BaseConverter:IBaseConverter
{ {
private IDataNavigator dataNavigator;
private ExporterPage singlePage;
private SectionBounds sectionBounds;
private Rectangle parentRectangle;
private ILayouter layouter;
private Size saveSize; private Size saveSize;
private IExpressionEvaluatorFacade evaluator; private IExpressionEvaluatorFacade evaluator;
@ -49,11 +44,11 @@ namespace ICSharpCode.Reports.Core.Exporter
if (layouter == null) { if (layouter == null) {
throw new ArgumentNullException("layouter"); throw new ArgumentNullException("layouter");
} }
this.singlePage = singlePage; this.SinglePage = singlePage;
this.dataNavigator = dataNavigator; this.DataNavigator = dataNavigator;
this.sectionBounds = this.singlePage.SectionBounds; SectionBounds = this.SinglePage.SectionBounds;
this.layouter = layouter; this.Layouter = layouter;
this.evaluator = StandardPrinter.CreateEvaluator(this.singlePage,this.dataNavigator); this.Evaluator = StandardPrinter.CreateEvaluator(this.SinglePage,this.DataNavigator);
} }
@ -75,6 +70,8 @@ namespace ICSharpCode.Reports.Core.Exporter
#endregion #endregion
#region Events
protected void FireRowRendering (ISimpleContainer detailRow) protected void FireRowRendering (ISimpleContainer detailRow)
{ {
BaseRowItem row = detailRow as BaseRowItem; BaseRowItem row = detailRow as BaseRowItem;
@ -104,11 +101,12 @@ namespace ICSharpCode.Reports.Core.Exporter
{ {
SectionRenderEventArgs srea = new SectionRenderEventArgs(section, SectionRenderEventArgs srea = new SectionRenderEventArgs(section,
this.SinglePage.PageNumber, this.SinglePage.PageNumber,
this.dataNavigator.CurrentRow, this.DataNavigator.CurrentRow,
section); section);
EventHelper.Raise<SectionRenderEventArgs>(SectionRendering,this,srea); EventHelper.Raise<SectionRenderEventArgs>(SectionRendering,this,srea);
} }
#endregion
protected static ExporterCollection ConvertItems (ISimpleContainer row,Point offset) protected static ExporterCollection ConvertItems (ISimpleContainer row,Point offset)
@ -151,12 +149,12 @@ namespace ICSharpCode.Reports.Core.Exporter
PrepareContainerForConverting(section,simpleContainer); PrepareContainerForConverting(section,simpleContainer);
FireRowRendering(simpleContainer); FireRowRendering(simpleContainer);
Point curPos = BaseConvert(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition); Point curPos = BaseConvert(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition);
AfterConverting (section,mylist); AfterConverting (mylist);
return curPos; return curPos;
} }
protected void PageBreakAfterGroupChange(BaseSection section,ISimpleContainer container,ExporterCollection exporterCollection) protected void PageBreakAfterGroupChange(BaseSection section,ExporterCollection exporterCollection)
{ {
if (CheckPageBreakAfterGroupChange(section) ) { 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); var groupedRows = BaseConverter.FindGroupHeader(container);
if (groupedRows.Count > 0) { if (groupedRows.Count > 0) {
@ -204,7 +202,7 @@ namespace ICSharpCode.Reports.Core.Exporter
public virtual ExporterCollection Convert(BaseReportItem parent, BaseReportItem item) 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();; return new ExporterCollection();;
} }
@ -212,31 +210,25 @@ namespace ICSharpCode.Reports.Core.Exporter
#endregion #endregion
public Rectangle ParentRectangle { public Rectangle ParentRectangle {get;private set;}
get { return parentRectangle; }
} 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 { public ILayouter Layouter {get; private set;}
get { return sectionBounds; }
}
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) 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) protected void PrepareContainerForConverting(BaseSection section,ISimpleContainer simpleContainer)
{ {
FireSectionRendering(section); 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); StandardPrinter.EvaluateRow(Evaluator,convertedList);
} }
@ -278,7 +263,7 @@ namespace ICSharpCode.Reports.Core.Exporter
FillRow(simpleContainer); FillRow(simpleContainer);
PrepareContainerForConverting(section,simpleContainer); PrepareContainerForConverting(section,simpleContainer);
Point curPos = BaseConvert(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition); Point curPos = BaseConvert(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition);
AfterConverting (section,mylist); AfterConverting (mylist);
simpleContainer.Size = rowSize; simpleContainer.Size = rowSize;
return curPos; return curPos;
} }

5
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs
Unescape View File

@ -70,7 +70,6 @@ namespace ICSharpCode.Reports.Core.Exporter
childSize = section.Items[1].Size; childSize = section.Items[1].Size;
} }
Rectangle pageBreakRect = Rectangle.Empty;
do { do {
base.SaveSectionSize(section.Size); base.SaveSectionSize(section.Size);
@ -115,7 +114,7 @@ namespace ICSharpCode.Reports.Core.Exporter
// GroupFooter // GroupFooter
base.ConvertGroupFooter(section,section,exporterCollection); base.ConvertGroupFooter(section,section,exporterCollection);
base.PageBreakAfterGroupChange(section,section,exporterCollection); base.PageBreakAfterGroupChange(section,exporterCollection);
base.Evaluator.SinglePage.IDataNavigator = base.DataNavigator; base.Evaluator.SinglePage.IDataNavigator = base.DataNavigator;
} }
@ -183,7 +182,7 @@ namespace ICSharpCode.Reports.Core.Exporter
StandardPrinter.EvaluateRow(base.Evaluator,list); StandardPrinter.EvaluateRow(base.Evaluator,list);
exportList.AddRange(list); exportList.AddRange(list);
AfterConverting (section,list); AfterConverting (list);
retVal = new Point (DefaultLeftPosition,offset.Y + groupCollection[0].Size.Height + 20 + (3 *GlobalValues.GapBetweenContainer)); retVal = new Point (DefaultLeftPosition,offset.Y + groupCollection[0].Size.Height + 20 + (3 *GlobalValues.GapBetweenContainer));
} else { } else {
base.FireGroupHeaderRendering(groupedRows[0]); base.FireGroupHeaderRendering(groupedRows[0]);

12
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs
Unescape View File

@ -49,14 +49,14 @@ namespace ICSharpCode.Reports.Core.Exporter
BaseSection section = table.Parent as BaseSection; 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.CurrentPosition = new Point(PrintHelper.DrawingAreaRelativeToParent(this.table.Parent,this.table).Location.X,
base.SectionBounds.DetailStart.Y); base.SectionBounds.DetailStart.Y);
// int defaultLeftPos = base.CurrentPosition.X;
base.DefaultLeftPosition = 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(); this.table.Items.SortByLocation();
// Header // Header
@ -115,7 +115,7 @@ namespace ICSharpCode.Reports.Core.Exporter
// GroupFooter // GroupFooter
base.ConvertGroupFooter(section,table,exporterCollection); base.ConvertGroupFooter(section,table,exporterCollection);
base.PageBreakAfterGroupChange(section,table,exporterCollection); base.PageBreakAfterGroupChange(section,exporterCollection);
base.Evaluator.SinglePage.IDataNavigator = base.DataNavigator; base.Evaluator.SinglePage.IDataNavigator = base.DataNavigator;
} }
@ -198,7 +198,7 @@ namespace ICSharpCode.Reports.Core.Exporter
StandardPrinter.EvaluateRow(base.Evaluator,list); StandardPrinter.EvaluateRow(base.Evaluator,list);
exportList.AddRange(list); exportList.AddRange(list);
AfterConverting (section,list); AfterConverting (list);
retVal = new Point (base.DefaultLeftPosition,offset.Y + groupCollection[0].Size.Height + 20 + (3 *GlobalValues.GapBetweenContainer)); retVal = new Point (base.DefaultLeftPosition,offset.Y + groupCollection[0].Size.Height + 20 + (3 *GlobalValues.GapBetweenContainer));

Write Preview
Loading…
Cancel
Save