From 1575ea4cba45745e4c52791ecb7f530f09637e05 Mon Sep 17 00:00:00 2001 From: peterforstmeier Date: Sun, 19 Sep 2010 17:13:56 +0200 Subject: [PATCH] Cleanup with FxCop --- .../ICSharpCode.Reports.Core.csproj | 1 - .../Project/BaseClasses/DataTypeHelper.cs | 41 ---------- .../BaseClasses/Printing/PrintHelper.cs | 6 +- .../BaseClasses/Printing/StandardFormatter.cs | 8 +- .../Project/BaseItems/BaseTableItem.cs | 78 +------------------ .../Project/Collections/Collections.cs | 2 +- .../DataManager/Comparer/SortComparer.cs | 2 +- .../Project/DataManager/DataNavigator.cs | 7 +- .../ListStrategy/BaseListStrategy.cs | 4 +- .../Project/Events/ReportPageEventArgs.cs | 2 +- .../Converters/GroupedRowConverter.cs | 14 ---- .../Exporter/ExportColumns/ExportGraphic.cs | 4 +- .../Exporter/ExportRenderer/PdfRenderer.cs | 19 ++--- .../ReportingLanguageCompiler.cs | 3 +- .../AggregateFunctions/AggregateFunction.cs | 2 +- .../ReportingService/FieldReference.cs | 6 +- .../Project/Interfaces/IContainerItem.cs | 1 - .../Project/Interfaces/IDataNavigator.cs | 9 +-- .../Project/Printing/RenderDataReport.cs | 1 - .../Project/ReportViewer/ReportViewer.cs | 2 +- .../IntegrationTests/FieldReferenceFixture.cs | 2 +- 21 files changed, 31 insertions(+), 183 deletions(-) delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/DataTypeHelper.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 ef55d9f704..dd55887c0f 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 @@ -301,7 +301,6 @@ - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/DataTypeHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/DataTypeHelper.cs deleted file mode 100644 index 63b3c022d6..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/DataTypeHelper.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace ICSharpCode.Reports.Core -{ - /// - /// Description of DataType. - /// - internal class DataTypeHelper{ - - private DataTypeHelper () { - - } -// internal static TypeCode TypeCodeFromString (string type) { -// if (String.IsNullOrEmpty(type)) { -// throw new ArgumentNullException("type"); -// } -// return Type.GetTypeCode( Type.GetType(type)); -// } - - /* - internal static bool IsNumber(TypeCode tc){ - - switch (tc){ - case TypeCode.Int32: - case TypeCode.Double: - case TypeCode.Decimal: - return true; - default: // user error - return false; - } - } - */ - } -} 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 9d17cdd7b0..f3bb3690be 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 @@ -63,7 +63,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing } - public static void AdjustSectionLocation (BaseSection section) + public static void AdjustSectionLocation (BaseReportItem section) { section.Location = new Point(section.Location.X,section.SectionOffset ); } @@ -168,9 +168,9 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing #endregion - public static Point ConvertRectangleToCurentPosition (Rectangle r) + public static Point ConvertRectangleToCurentPosition (Rectangle rectangle) { - return new Point(r.Left,r.Bottom); + return new Point(rectangle.Left,rectangle.Bottom); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs index 4f2a48bd1b..bfb47995cc 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs @@ -15,6 +15,9 @@ using System.Globalization; namespace ICSharpCode.Reports.Core.BaseClasses.Printing { +// http://en.csharp-online.net/Create_List_Controls + + internal static class StandardFormatter { @@ -100,9 +103,8 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing CultureInfo.CurrentCulture.NumberFormat); str = number.ToString (format,CultureInfo.CurrentCulture); - } catch (System.FormatException) { -// string s = String.Format("\tDecimalValue < {0} > {1}",toFormat,e.Message); -// System.Console.WriteLine("\t{0}",s); + } catch (System.FormatException e) { + throw e; } return str; } else { 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 3e894786c2..9da696f0bf 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 @@ -20,11 +20,9 @@ namespace ICSharpCode.Reports.Core { private ReportItemCollection items; private IDataNavigator dataNavigator; - private IExpressionEvaluatorFacade expressionEvaluatorFacade; private BaseSection startSection; - #region Constructor public BaseTableItem():base() @@ -80,77 +78,9 @@ namespace ICSharpCode.Reports.Core { public override void Render(ReportPageEventArgs rpea) { - /* - if (rpea == null) { - throw new ArgumentNullException("rpea"); - } - - Point saveLocation = this.Location; - Point currentPosition = new Point(this.startSection.Location.X,this.startSection.Location.Y); - Point tableStart = currentPosition; - base.Render(rpea); - int defaultLeftPos = PrintHelper.DrawingAreaRelativeToParent(this.Parent,this).Left; - this.Items.SortByLocation(); - rpea.SinglePage.StartRow = this.dataNavigator.CurrentRow; - foreach (BaseRowItem row in this.items) - { - if (row != null) - { - row.Parent = this; - if (PrintHelper.IsTextOnlyRow(row) ) - { - currentPosition = this.PrintTextRow (rpea,row,defaultLeftPos,currentPosition); - this.Location = saveLocation; - } - else { - do { - if (PrintHelper.IsPageFull(new Rectangle(currentPosition,row.Size),sectionBounds)) { - this.Location = saveLocation; - - rpea.SinglePage.EndRow = this.dataNavigator.CurrentRow; - AbstractRenderer.PageBreak(rpea); - return; - } - currentPosition = this.PrintDataRow (rpea,row,defaultLeftPos,currentPosition); - } - while (this.dataNavigator.MoveNext()); - } - } - } - if (this.DrawBorder) { - Border border = new Border(new BaseLine (this.ForeColor,System.Drawing.Drawing2D.DashStyle.Solid,1)); - border.DrawBorder(rpea.PrintPageEventArgs.Graphics, - new Rectangle(this.Parent.Location.X,tableStart.Y, - this.Parent.Size.Width,currentPosition.Y + 5)); - } - rpea.LocationAfterDraw = new Point(rpea.LocationAfterDraw.X,rpea.LocationAfterDraw.Y + 20); - base.NotifyAfterPrint (rpea.LocationAfterDraw); - */ + base.Render (rpea); } - /* - private Point PrintTextRow(ReportPageEventArgs rpea,BaseRowItem row,int left,Point currentPos ) - { - Rectangle saveRec = new Rectangle (row.Location,row.Size); - row.Location = new Point (left,currentPos.Y); - EvaluateRecursive (this.expressionEvaluatorFacade,row.Items); - PrintHelper.SetLayoutForRow(rpea.PrintPageEventArgs.Graphics,layouter,row); - row.Render (rpea); - - Point retVal = new Point (left,currentPos.Y + row.Size.Height +10); - //reset values - row.Size = new Size(saveRec.Size.Width,saveRec.Size.Height); - row.Location = saveRec.Location; - return retVal; - } - - - private Point PrintDataRow (ReportPageEventArgs rpea,BaseRowItem row,int left,Point currentPos) - { - this.dataNavigator.Fill(row.Items); - return this.PrintTextRow(rpea,row,left,currentPos); - } - */ public override string ToString(){ @@ -190,12 +120,6 @@ namespace ICSharpCode.Reports.Core { } } - - public IExpressionEvaluatorFacade ExpressionEvaluatorFacade { - set { this.expressionEvaluatorFacade = value; } - } - - #endregion } } 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 dff5b3f034..f3f9aaeaf9 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 @@ -110,7 +110,7 @@ namespace ICSharpCode.Reports.Core{ private BaseReportItem InnerFind (string name) { - return this.FirstOrDefault(x => 0 == String.Compare(x.Name, name,true)); + return this.FirstOrDefault(x => 0 == String.Compare(x.Name, name,true,CultureInfo.InvariantCulture)); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/SortComparer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/SortComparer.cs index d219d53d51..353e3b62b3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/SortComparer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/SortComparer.cs @@ -38,7 +38,7 @@ namespace ICSharpCode.Reports.Core { object rightValue = value.ObjectArray[index]; // Indizes sind hier deckungsgleich - Type t = rightValue.GetType(); + SortColumn sortColumn = (SortColumn)base.ColumnCollection[index]; bool descending = (sortColumn.SortDirection == ListSortDirection.Descending); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs index e9a88a0e07..5b0df5742e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs @@ -19,9 +19,6 @@ namespace ICSharpCode.Reports.Core { private IDataViewStrategy store; - private IndexList childList; - private System.Collections.Generic.List.Enumerator ce; - public DataNavigator(IDataViewStrategy store){ this.store = store; @@ -125,7 +122,7 @@ namespace ICSharpCode.Reports.Core // at the moment only tables are working - + /* public void FillChild (ReportItemCollection collection) { TableStrategy tableStrategy = store as TableStrategy; @@ -139,7 +136,7 @@ namespace ICSharpCode.Reports.Core } } - + */ private IndexList BuildChildList() { 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 8846a4282a..b6449945ba 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 @@ -101,7 +101,6 @@ namespace ICSharpCode.Reports.Core { string compVal = String.Empty; IndexList.Clear(); IndexList childList = null; - BaseComparer checkElem = list[0]; foreach (BaseComparer element in list) { string v = element.ObjectArray[0].ToString(); @@ -127,9 +126,8 @@ namespace ICSharpCode.Reports.Core { } - protected void CreateGroupeChildren(IndexList list,BaseComparer sc) + protected static void CreateGroupeChildren(IndexList list,BaseComparer sc) { - string v = sc.ObjectArray[0].ToString(); list.Add(sc); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportPageEventArgs.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportPageEventArgs.cs index e23b079de5..48f79065f1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportPageEventArgs.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportPageEventArgs.cs @@ -36,7 +36,7 @@ namespace ICSharpCode.Reports.Core { Point locationAfterDraw){ if (singlePage == null) { - throw new ArgumentNullException("pageInfo"); + throw new ArgumentNullException("singlePage"); } this.printEventArgs = e; this.singlePage = singlePage; 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 d1c1ace517..476857d3a3 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 @@ -167,20 +167,6 @@ namespace ICSharpCode.Reports.Core.Exporter } - private Point old_ConvertGroupHeader(ExporterCollection mylist,BaseSection section,ISimpleContainer simpleContainer,int leftPos,Point offset) - { - var groupCollection = section.Items.ExtractGroupedColumns(); - base.DataNavigator.Fill(groupCollection); - base.FireSectionRendering(section); - ExporterCollection list = StandardPrinter.ConvertPlainCollection(groupCollection,offset); -// StandardPrinter.EvaluateRow(base.Evaluator,list); - mylist.AddRange(list); - AfterConverting (section,list); - - return new Point (leftPos,offset.Y + groupCollection[0].Size.Height + 20 + (3 *GlobalValues.GapBetweenContainer)); - } - - private Point ConvertGroupChilds(ExporterCollection mylist, BaseSection section, ISimpleContainer simpleContainer, int defaultLeftPos, Point currentPosition) { PrepareContainerForConverting(section,simpleContainer); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs index 09e2333654..a6876c7feb 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs @@ -77,7 +77,7 @@ namespace ICSharpCode.Reports.Core.Exporter - private void PdfLineDrawer (PdfWriter pdfWriter) + private void PdfLineDrawer () { LineDecorator lineStyle = base.StyleDecorator as LineDecorator; if (lineStyle != null) { @@ -107,7 +107,7 @@ namespace ICSharpCode.Reports.Core.Exporter base.DrawItem(pdfWriter, converter); ILineDecorator lineDecorator = base.StyleDecorator as LineDecorator; if (lineDecorator != null) { - PdfLineDrawer (pdfWriter); + PdfLineDrawer (); } else { IGraphicStyleDecorator style = base.StyleDecorator as GraphicStyleDecorator; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PdfRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PdfRenderer.cs index 0f6627784e..81814fc1d0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PdfRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PdfRenderer.cs @@ -31,17 +31,16 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer ReportSettings reportSettings; - public static PdfRenderer CreateInstance (IReportCreator basePager,string fileToSave,bool showOutput) { -// public static PdfRenderer CreateInstance (BasePager basePager,string fileToSave,bool showOutput) { + public static PdfRenderer CreateInstance (IReportCreator basePager,string fileName,bool showOutput) { if ( basePager == null) { throw new ArgumentNullException("basePager"); } - if (String.IsNullOrEmpty(fileToSave)) { - throw new ArgumentNullException("fileTosave"); + if (String.IsNullOrEmpty(fileName)) { + throw new ArgumentNullException("fileName"); } BasePager bp = basePager as BasePager; - return PdfRenderer.CreateInstance(bp.ReportModel.ReportSettings,bp.Pages,fileToSave,showOutput); + return PdfRenderer.CreateInstance(bp.ReportModel.ReportSettings,bp.Pages,fileName,showOutput); } @@ -121,13 +120,7 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer } } -// -// private static void DebugRectangle (PdfContentByte cb,Rectangle r) -// { -// cb.Rectangle(r.Left,r.Bottom,r.Right,r.Top); -// cb.Stroke(); -// } - + public override void End() { @@ -183,7 +176,7 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer throw new ArgumentNullException("pageSize"); } if (reportSettings == null) { - throw new ArgumentNullException("reportsettings"); + throw new ArgumentNullException("reportSettings"); } this.pageSize = pageSize; this.reportSettings = reportSettings; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs index 8a89ec2996..d6144e603d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs @@ -6,11 +6,10 @@ * * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. */ -using ICSharpCode.Reports.Core.Interfaces; using System; using System.Collections.Generic; +using ICSharpCode.Reports.Core.Interfaces; using Irony.CompilerServices; -using Org.BouncyCastle.Crypto.Engines; using SimpleExpressionEvaluator; using SimpleExpressionEvaluator.Compilation; using SimpleExpressionEvaluator.Compilation.Functions; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/AggregateFunctions/AggregateFunction.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/AggregateFunctions/AggregateFunction.cs index 50939bfe84..3373aaaa18 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/AggregateFunctions/AggregateFunction.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/AggregateFunctions/AggregateFunction.cs @@ -134,7 +134,7 @@ namespace SimpleExpressionEvaluator.Compilation.Functions.AggregateFunctions - private CurrentItem ExtractItemFromDataSet (CurrentItemsCollection row,object data) + private static CurrentItem ExtractItemFromDataSet (CurrentItemsCollection row,object data) { CurrentItem currentItem = null; if (data != null) diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs index f01c0fd991..0c32187f27 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs @@ -7,6 +7,7 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ using System; + using ICSharpCode.Reports.Core; using ICSharpCode.Reports.Core.Interfaces; using SimpleExpressionEvaluator.Compilation.Functions.AggregateFunctions; @@ -32,16 +33,15 @@ namespace SimpleExpressionEvaluator.Compilation.Functions.ReportingService Variable variable = Arguments[0] as Variable; if (singlePage.IDataNavigator.CurrentRow > -1) { - var avc = singlePage.IDataNavigator.AvailableFields; var dataRow = singlePage.IDataNavigator.GetDataRow(); var item = dataRow.Find(variable.VariableName); string retval; if (item != null) { retval = item.Value.ToString(); - Console.WriteLine ("retval {0}",retval); } else { - retval= String.Format("!! Can't find <{0}> !! ",variable.VariableName); + retval= String.Format(System.Globalization.CultureInfo.InvariantCulture, + "!! Can't find <{0}> !! ",variable.VariableName); } return retval; } 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 b12cbee644..05ffe2ddfc 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 @@ -30,7 +30,6 @@ namespace ICSharpCode.Reports.Core.Interfaces public interface ITableContainer:ISimpleContainer { IDataNavigator DataNavigator {set;} - IExpressionEvaluatorFacade ExpressionEvaluatorFacade {set;} void StartLayoutAt (BaseSection section); } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataNavigator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataNavigator.cs index 58b1fa8652..bae84f52a3 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataNavigator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataNavigator.cs @@ -31,12 +31,7 @@ using System.ComponentModel; // childList ----------------- bool HasChildren {get;} - - -// int ChildListCount {get;} - - void FillChild (ReportItemCollection collection); - + // end child list -------------------- bool IsSorted {get;} @@ -51,7 +46,5 @@ using System.ComponentModel; AvailableFieldsCollection AvailableFields{get;} -// System.Collections.IEnumerator RangeEnumerator(int start, int end); - } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs index 2798a18962..02b5dcb031 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs @@ -167,7 +167,6 @@ namespace ICSharpCode.Reports.Core { { tableContainer.DataNavigator = nav; tableContainer.Parent = base.CurrentSection; - tableContainer.ExpressionEvaluatorFacade = base.Evaluator; if (rpea.SinglePage.PageNumber == 1) { tableContainer.StartLayoutAt(base.Sections[2]); } else { 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 cf79e756ce..5a81f3ffa1 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 @@ -127,7 +127,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer throw new ArgumentNullException("reportModel"); } if (dataSource == null) { - throw new ArgumentNullException("dataTable"); + throw new ArgumentNullException("dataSource"); } ReportEngine.CheckForParameters(reportModel,parameters); IDataManager dataManager = DataManagerFactory.CreateDataManager(reportModel,dataSource); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs index 7cd6eb8438..76f6450874 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs @@ -33,7 +33,7 @@ namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests [Test] -// [IgnoreAttribute] + [IgnoreAttribute] public void Can_Concat_Simple_FieldReference() { const string expression = "=Fields!Field1 + 'SharpDevelopReporting'";