Browse Source

Cleanup (FxCop)

reports
Peter Forstmeier 13 years ago
parent
commit
6c572bac15
  1. 8
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/Listhandling/CollectionSource.cs
  2. 9
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ExportRenderer/FixedDocumentCreator.cs
  3. 20
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/DebugExporter.cs
  4. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/WpfVisitor.cs
  5. 22
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs
  6. 3
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/GlobalEnums.cs
  7. 6
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/BasePageBuilder.cs
  8. 1
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/Converter/ContainerConverter.cs
  9. 6
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs
  10. 9
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/PreviewViewModel.cs

8
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/Listhandling/CollectionSource.cs

@ -390,10 +390,10 @@ namespace ICSharpCode.Reporting.DataManager.Listhandling
} }
} }
static string WrongColumnName(string propertyName) // static string WrongColumnName(string propertyName)
{ // {
return String.Format(CultureInfo.InvariantCulture, "Error : <{0}> missing!", propertyName); // return String.Format(CultureInfo.InvariantCulture, "Error : <{0}> missing!", propertyName);
} // }
#endregion #endregion

9
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ExportRenderer/FixedDocumentCreator.cs

@ -37,9 +37,8 @@ namespace ICSharpCode.Reporting.ExportRenderer
} }
public UIElement CreateFixedPage(ExportPage exportPage) { public static UIElement CreateFixedPage(ExportPage exportPage) {
var fixedPage = new FixedPage(); var fixedPage = new FixedPage();
fixedPage.Width = exportPage.Size.ToWpf().Width; fixedPage.Width = exportPage.Size.ToWpf().Width;
fixedPage.Height = exportPage.Size.ToWpf().Height; fixedPage.Height = exportPage.Size.ToWpf().Height;
@ -67,7 +66,7 @@ namespace ICSharpCode.Reporting.ExportRenderer
public TextBlock CreateTextBlock(ExportText exportText) public TextBlock CreateTextBlock(ExportText exportText)
{ {
var textBlock = new TextBlock(); var textBlock = new TextBlock();
Console.WriteLine("createtextBlock for {0}",exportText.Text);
textBlock.Foreground = ConvertBrush(exportText.ForeColor); textBlock.Foreground = ConvertBrush(exportText.ForeColor);
// textBlock.Background = ConvertBrush(exportText.BackColor); // textBlock.Background = ConvertBrush(exportText.BackColor);
textBlock.Background = ConvertBrush(System.Drawing.Color.LightGray); textBlock.Background = ConvertBrush(System.Drawing.Color.LightGray);
@ -98,7 +97,7 @@ namespace ICSharpCode.Reporting.ExportRenderer
} }
Size MeasureTextInWpf(ExportText exportText) static Size MeasureTextInWpf(ExportText exportText)
{ {
FormattedText ft = new FormattedText(exportText.Text, FormattedText ft = new FormattedText(exportText.Text,
@ -134,7 +133,7 @@ namespace ICSharpCode.Reporting.ExportRenderer
return canvas; return canvas;
} }
void SetPositionAndSize(FrameworkElement element,ExportColumn column) { static void SetPositionAndSize(FrameworkElement element,ExportColumn column) {
if (column == null) if (column == null)
throw new ArgumentNullException("column"); throw new ArgumentNullException("column");
SetPosition(element,column); SetPosition(element,column);

20
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/DebugExporter.cs

@ -63,25 +63,5 @@ namespace ICSharpCode.Reporting.Exporter
} }
} }
void aaShowDebug(string leading,IExportContainer container)
{
Console.WriteLine();
Console.WriteLine("DebugExport for {0}{1}",leading,container.Name);
foreach (var item in container.ExportedItems) {
var exportContainer = item as IExportContainer;
var acceptor = item as IAcceptor;
if (exportContainer != null) {
if (acceptor != null) {
acceptor.Accept(visitor);
}
ShowDebug(leading = leading + "--",exportContainer);
} else {
if (acceptor != null) {
// acceptor.Accept(visitor);
}
}
}
}
} }
} }

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/WpfVisitor.cs

@ -30,7 +30,7 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
public override void Visit(ExportPage page) public override void Visit(ExportPage page)
{ {
UIElement = documentCreator.CreateFixedPage(page); UIElement = FixedDocumentCreator.CreateFixedPage(page);
} }

22
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs

@ -61,7 +61,7 @@ namespace ICSharpCode.Reporting.Exporter
if (exportContainer != null) { if (exportContainer != null) {
if (exportContainer.Name =="ReportDetail") { if (exportContainer.Name =="ReportDetail") {
Console.WriteLine("Section {0}",item.Name); // Console.WriteLine("Section {0}",item.Name);
exportContainer.BackColor = System.Drawing.Color.LightBlue; exportContainer.BackColor = System.Drawing.Color.LightBlue;
} }
@ -72,12 +72,12 @@ namespace ICSharpCode.Reporting.Exporter
if (parentCanvas == null) { if (parentCanvas == null) {
containerCanvas = CreateContainer(fixedPage,exportContainer); containerCanvas = CreateContainer(fixedPage,exportContainer);
Console.WriteLine("Section {0} at {1} size {2}",item.Name,CanvasHelper.GetPosition(containerCanvas),containerCanvas.DesiredSize); // Console.WriteLine("Section {0} at {1} size {2}",item.Name,CanvasHelper.GetPosition(containerCanvas),containerCanvas.DesiredSize);
fixedPage.Children.Add(containerCanvas); fixedPage.Children.Add(containerCanvas);
parentCanvas = containerCanvas; parentCanvas = containerCanvas;
} else { } else {
containerCanvas = CreateContainer(parentCanvas,exportContainer); containerCanvas = CreateContainer(parentCanvas,exportContainer);
Console.WriteLine("Row {0} at {1}",item.Name,CanvasHelper.GetPosition(containerCanvas)); // Console.WriteLine("Row {0} at {1}",item.Name,CanvasHelper.GetPosition(containerCanvas));
parentCanvas.Children.Add(containerCanvas); parentCanvas.Children.Add(containerCanvas);
} }
@ -98,7 +98,7 @@ namespace ICSharpCode.Reporting.Exporter
} }
bool IsContainer (IExportColumn column) { static bool IsContainer (IExportColumn column) {
var container = column as IExportContainer; var container = column as IExportContainer;
if (container == null) { if (container == null) {
return false; return false;
@ -108,8 +108,8 @@ namespace ICSharpCode.Reporting.Exporter
Canvas CreateContainer(UIElement parent,IExportContainer exportContainer) Canvas CreateContainer(UIElement parent,IExportContainer exportContainer)
{ {
var containerAcceptor = exportContainer as IAcceptor; var acceptor = exportContainer as IAcceptor;
containerAcceptor.Accept(visitor); acceptor.Accept(visitor);
var canvas = (Canvas)visitor.UIElement; var canvas = (Canvas)visitor.UIElement;
return canvas; return canvas;
} }
@ -117,12 +117,10 @@ namespace ICSharpCode.Reporting.Exporter
UIElement CreateSingleEntry(UIElement parent, IExportColumn element) UIElement CreateSingleEntry(UIElement parent, IExportColumn element)
{ {
var v = element as IAcceptor; var acceptor = element as IAcceptor;
v.Accept(visitor); acceptor.Accept(visitor);
var c = visitor.UIElement; var uiElement = visitor.UIElement;
return uiElement;
// Console.WriteLine("CreateSingleEntry after {0}",CanvasHelper.GetPosition(c));
return c;
} }

3
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/GlobalEnums.cs

@ -15,6 +15,9 @@ namespace ICSharpCode.Reporting.Globals
/// </summary> /// </summary>
public class GlobalEnums public class GlobalEnums
{ {
private GlobalEnums() {
}
public enum ReportSection { public enum ReportSection {
ReportHeader, ReportHeader,
ReportPageHeader, ReportPageHeader,

6
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/BasePageBuilder.cs

@ -140,8 +140,6 @@ namespace ICSharpCode.Reporting.PageBuilder
var list = containerConverter.CreateConvertedList(container.Items); var list = containerConverter.CreateConvertedList(container.Items);
convertedContainer.ExportedItems.AddRange(list);
containerConverter.SetParent(convertedContainer,list); containerConverter.SetParent(convertedContainer,list);
convertedContainer.ExportedItems.AddRange(list); convertedContainer.ExportedItems.AddRange(list);
@ -151,8 +149,6 @@ namespace ICSharpCode.Reporting.PageBuilder
} }
protected void AddSectionToPage(IExportContainer header) protected void AddSectionToPage(IExportContainer header)
{ {
header.Parent = CurrentPage; header.Parent = CurrentPage;
@ -166,7 +162,7 @@ namespace ICSharpCode.Reporting.PageBuilder
} }
protected void ArrangeContainer(IExportContainer exportContainer) protected static void ArrangeContainer(IExportContainer exportContainer)
{ {
var exportArrange = exportContainer.GetArrangeStrategy(); var exportArrange = exportContainer.GetArrangeStrategy();
exportArrange.Arrange(exportContainer); exportArrange.Arrange(exportContainer);

1
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/Converter/ContainerConverter.cs

@ -67,7 +67,6 @@ namespace ICSharpCode.Reporting.PageBuilder.Converter
} }
} }
internal IReportContainer Container { get; private set; }
protected Point CurrentLocation { get; set; } protected Point CurrentLocation { get; set; }

6
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs

@ -71,7 +71,7 @@ namespace ICSharpCode.Reporting.PageBuilder
detail.ExportedItems.AddRange(convertedItems); detail.ExportedItems.AddRange(convertedItems);
CurrentPage.ExportedItems.Insert(2,detail); CurrentPage.ExportedItems.Insert(2,detail);
Pages.Add(CurrentPage); Pages.Add(CurrentPage);
MeasureAndArrangeContainer(converter,detail); MeasureAndArrangeContainer(detail);
position = ResetPosition(); position = ResetPosition();
CurrentPage = CreateNewPage(); CurrentPage = CreateNewPage();
@ -81,7 +81,7 @@ namespace ICSharpCode.Reporting.PageBuilder
} else { } else {
detail.ExportedItems.AddRange(convertedItems); detail.ExportedItems.AddRange(convertedItems);
MeasureAndArrangeContainer(converter,detail); MeasureAndArrangeContainer(detail);
position = new Point(CurrentSection.Location.Y,position.Y + CurrentSection.Size.Height); position = new Point(CurrentSection.Location.Y,position.Y + CurrentSection.Size.Height);
} }
} }
@ -186,7 +186,7 @@ namespace ICSharpCode.Reporting.PageBuilder
} }
void MeasureAndArrangeContainer(IContainerConverter converter,IExportContainer container) void MeasureAndArrangeContainer(IExportContainer container)
{ {
container.DesiredSize = MeasureElement(container); container.DesiredSize = MeasureElement(container);
ArrangeContainer(container); ArrangeContainer(container);

9
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/PreviewViewModel.cs

@ -40,21 +40,14 @@ namespace ICSharpCode.Reporting.WpfReportViewer
this.document = wpfExporter.Document; this.document = wpfExporter.Document;
} }
FixedDocument CreateFixedDocument(ReportSettings reportSettings) static FixedDocument CreateFixedDocument(ReportSettings reportSettings)
{ {
var document = new FixedDocument(); var document = new FixedDocument();
var s = document.DocumentPaginator.PageSize;
document.DocumentPaginator.PageSize = new System.Windows.Size(reportSettings.PageSize.Width, document.DocumentPaginator.PageSize = new System.Windows.Size(reportSettings.PageSize.Width,
reportSettings.PageSize.Height); reportSettings.PageSize.Height);
return document; return document;
} }
static void AddPageToDocument(FixedDocument fixedDocument,FixedPage page)
{
var pageContent = new PageContent();
((IAddChild)pageContent).AddChild(page);
fixedDocument.Pages.Add(pageContent);
}
public FixedDocument Document public FixedDocument Document
{ {

Loading…
Cancel
Save