Browse Source

Cleanup with FxCop

pull/1/head
peterforstmeier 15 years ago
parent
commit
1575ea4cba
  1. 1
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
  2. 41
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/DataTypeHelper.cs
  3. 6
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs
  4. 8
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs
  5. 78
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs
  6. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs
  7. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/SortComparer.cs
  8. 7
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs
  9. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs
  10. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportPageEventArgs.cs
  11. 14
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs
  12. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs
  13. 19
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PdfRenderer.cs
  14. 3
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs
  15. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/AggregateFunctions/AggregateFunction.cs
  16. 6
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs
  17. 1
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IContainerItem.cs
  18. 9
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataNavigator.cs
  19. 1
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs
  20. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs
  21. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/FieldReferenceFixture.cs

1
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj

@ -301,7 +301,6 @@ @@ -301,7 +301,6 @@
<Compile Include="Project\BaseItems\BaseTableItem.cs" />
<Compile Include="Project\Exceptions\IllegalQueryException.cs" />
<Compile Include="Project\Events\SectionRenderEventArgs.cs" />
<Compile Include="Project\BaseClasses\DataTypeHelper.cs" />
<Compile Include="Project\Exporter\ExporterPage.cs" />
<Compile Include="Project\Exporter\DataPageBuilder.cs" />
<Compile Include="Project\Exceptions\MissingDataManagerException.cs" />

41
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/DataTypeHelper.cs

@ -1,41 +0,0 @@ @@ -1,41 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Peter Forstmeier" email="peter.forstmeier@t-online.de"/>
// <version>$Revision$</version>
// </file>
using System;
namespace ICSharpCode.Reports.Core
{
/// <summary>
/// Description of DataType.
/// </summary>
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;
}
}
*/
}
}

6
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs

@ -63,7 +63,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing @@ -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 @@ -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);
}

8
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs

@ -15,6 +15,9 @@ using System.Globalization; @@ -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 @@ -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 {

78
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs

@ -20,11 +20,9 @@ namespace ICSharpCode.Reports.Core { @@ -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 { @@ -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 { @@ -190,12 +120,6 @@ namespace ICSharpCode.Reports.Core {
}
}
public IExpressionEvaluatorFacade ExpressionEvaluatorFacade {
set { this.expressionEvaluatorFacade = value; }
}
#endregion
}
}

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs

@ -110,7 +110,7 @@ namespace ICSharpCode.Reports.Core{ @@ -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));
}

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/Comparer/SortComparer.cs

@ -38,7 +38,7 @@ namespace ICSharpCode.Reports.Core { @@ -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);

7
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs

@ -19,9 +19,6 @@ namespace ICSharpCode.Reports.Core @@ -19,9 +19,6 @@ namespace ICSharpCode.Reports.Core
{
private IDataViewStrategy store;
private IndexList childList;
private System.Collections.Generic.List<BaseComparer>.Enumerator ce;
public DataNavigator(IDataViewStrategy store){
this.store = store;
@ -125,7 +122,7 @@ namespace ICSharpCode.Reports.Core @@ -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 @@ -139,7 +136,7 @@ namespace ICSharpCode.Reports.Core
}
}
*/
private IndexList BuildChildList()
{

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs

@ -101,7 +101,6 @@ namespace ICSharpCode.Reports.Core { @@ -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 { @@ -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);
}

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Events/ReportPageEventArgs.cs

@ -36,7 +36,7 @@ namespace ICSharpCode.Reports.Core { @@ -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;

14
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs

@ -167,20 +167,6 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -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);

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs

@ -77,7 +77,7 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -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 @@ -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;

19
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/PdfRenderer.cs

@ -31,17 +31,16 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer @@ -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 @@ -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 @@ -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;

3
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ReportingLanguage/ReportingLanguageCompiler.cs

@ -6,11 +6,10 @@ @@ -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;

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/AggregateFunctions/AggregateFunction.cs

@ -134,7 +134,7 @@ namespace SimpleExpressionEvaluator.Compilation.Functions.AggregateFunctions @@ -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)

6
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs

@ -7,6 +7,7 @@ @@ -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 @@ -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;
}

1
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IContainerItem.cs

@ -30,7 +30,6 @@ namespace ICSharpCode.Reports.Core.Interfaces @@ -30,7 +30,6 @@ namespace ICSharpCode.Reports.Core.Interfaces
public interface ITableContainer:ISimpleContainer
{
IDataNavigator DataNavigator {set;}
IExpressionEvaluatorFacade ExpressionEvaluatorFacade {set;}
void StartLayoutAt (BaseSection section);
}
}

9
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IDataNavigator.cs

@ -31,12 +31,7 @@ using System.ComponentModel; @@ -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; @@ -51,7 +46,5 @@ using System.ComponentModel;
AvailableFieldsCollection AvailableFields{get;}
// System.Collections.IEnumerator RangeEnumerator(int start, int end);
}
}

1
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs

@ -167,7 +167,6 @@ namespace ICSharpCode.Reports.Core { @@ -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 {

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

@ -127,7 +127,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -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);

2
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 @@ -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'";

Loading…
Cancel
Save