Browse Source

FxCop Cleanup

pull/503/head
Peter Forstmeier 11 years ago
parent
commit
b2bdd81f35
  1. 5
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/InternalReportLoader.cs
  2. 3
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Factory/CreateFormSheetFromModel.cs
  3. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/HelpService.cs
  4. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/ToolboxService.cs
  5. 4
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs
  6. 9
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/ExpressionRunner.cs
  7. 4
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/TypeHelper.cs
  8. 3
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfExporter.cs
  9. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs
  10. 6
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs
  11. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs

5
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/InternalReportLoader.cs

@ -19,6 +19,7 @@
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.Design.Serialization; using System.ComponentModel.Design.Serialization;
using System.Globalization;
using System.IO; using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
@ -72,9 +73,9 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding
{ {
string message; string message;
if (generator.ViewContent.PrimaryFile.IsDirty) { if (generator.ViewContent.PrimaryFile.IsDirty) {
message = String.Format("Create Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName)); message = String.Format(CultureInfo.CurrentCulture,"Create Report <{0}> ...",Path.GetFileName(generator.ViewContent.PrimaryFile.FileName));
} else { } else {
message = String.Format("Load Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName)); message = String.Format(CultureInfo.CurrentCulture,"Load Report <{0}> ...",Path.GetFileName(generator.ViewContent.PrimaryFile.FileName));
} }
SD.StatusBar.SetMessage(message); SD.StatusBar.SetMessage(message);
} }

3
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Factory/CreateFormSheetFromModel.cs

@ -22,7 +22,6 @@ namespace ICSharpCode.Reporting.Addin.Factory
class CreateFormSheetFromModel class CreateFormSheetFromModel
{ {
public StringWriter ToXml(IReportModel reportModel) { public StringWriter ToXml(IReportModel reportModel) {
int locY = reportModel.ReportSettings.TopMargin; int locY = reportModel.ReportSettings.TopMargin;
@ -39,7 +38,7 @@ namespace ICSharpCode.Reporting.Addin.Factory
return xml; return xml;
} }
StringWriter ToXmlInternal(IReportModel model) static StringWriter ToXmlInternal(IReportModel model)
{ {
var writer = new StringWriterWithEncoding(System.Text.Encoding.UTF8); var writer = new StringWriterWithEncoding(System.Text.Encoding.UTF8);
var xml = XmlHelper.CreatePropperWriter(writer); var xml = XmlHelper.CreatePropperWriter(writer);

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/HelpService.cs

@ -64,7 +64,7 @@ namespace ICSharpCode.Reporting.Addin.Services
{ {
ShowHelpFromKeyword(generalKeyword); ShowHelpFromKeyword(generalKeyword);
} }
public void ShowHelp() static public void ShowHelp()
{ {
// HelpProvider.ShowHelp(f1Keyword); // HelpProvider.ShowHelp(f1Keyword);
} }

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/ToolboxService.cs

@ -188,7 +188,7 @@ namespace ICSharpCode.Reporting.Addin.Services
// needed for Toolbox drag & drop // needed for Toolbox drag & drop
if (serializedObject is System.Windows.Forms.IDataObject) { if (serializedObject is System.Windows.Forms.IDataObject) {
if (((System.Windows.Forms.IDataObject)serializedObject).GetDataPresent(typeof(ToolboxItem))) { if (((System.Windows.Forms.IDataObject)serializedObject).GetDataPresent(typeof(ToolboxItem))) {
ToolboxItem item = (ToolboxItem) ((System.Windows.Forms.IDataObject)serializedObject).GetData(typeof(ToolboxItem)); var item = (ToolboxItem) ((System.Windows.Forms.IDataObject)serializedObject).GetData(typeof(ToolboxItem));
// if (host != null) { // if (host != null) {
// ArrayList list = (ArrayList)toolboxByHost[host]; // ArrayList list = (ArrayList)toolboxByHost[host];
// if (list != null && list.Contains(item)) { // if (list != null && list.Contains(item)) {

4
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs

@ -85,12 +85,12 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
protected Collection<ExportPage> Pages {get; private set;} protected Collection<ExportPage> Pages {get; private set;}
protected bool IsContainer (IExportColumn column) { static protected bool IsContainer (IExportColumn column) {
return (column is ExportContainer)|| (column is GraphicsContainer); return (column is ExportContainer)|| (column is GraphicsContainer);
} }
protected bool IsGraphicsContainer (IExportColumn column) { static protected bool IsGraphicsContainer (IExportColumn column) {
return column is GraphicsContainer; return column is GraphicsContainer;
} }
} }

9
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/ExpressionRunner.cs

@ -34,21 +34,16 @@ namespace ICSharpCode.Reporting.Expressions
// http://blog.miraclespain.com/archive/2009/Oct-07.html // http://blog.miraclespain.com/archive/2009/Oct-07.html
// //
readonly Collection<ExportPage> pages; readonly Collection<ExportPage> pages;
readonly ReportSettings reportSettings;
readonly CollectionDataSource dataSource; readonly CollectionDataSource dataSource;
public ExpressionRunner(Collection<ExportPage> pages,ReportSettings reportSettings,CollectionDataSource dataSource) public ExpressionRunner(Collection<ExportPage> pages,ReportSettings reportSettings,CollectionDataSource dataSource){
{
this.pages = pages; this.pages = pages;
this.dataSource = dataSource; this.dataSource = dataSource;
this.reportSettings = reportSettings;
Visitor = new ExpressionVisitor(reportSettings); Visitor = new ExpressionVisitor(reportSettings);
} }
public void Run() public void Run(){
{
// Visitor = new ExpressionVisitor (reportSettings);
if (dataSource != null) { if (dataSource != null) {
if (dataSource.SortedList != null) { if (dataSource.SortedList != null) {
Visitor.SetCurrentDataSource(dataSource.SortedList); Visitor.SetCurrentDataSource(dataSource.SortedList);

4
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/TypeHelper.cs

@ -18,6 +18,7 @@
using System; using System;
using System.Data; using System.Data;
using System.Globalization;
namespace ICSharpCode.Reporting.Globals namespace ICSharpCode.Reporting.Globals
{ {
@ -28,8 +29,7 @@ namespace ICSharpCode.Reporting.Globals
{ {
public static DbType DbTypeFromStringRepresenation(string type) public static DbType DbTypeFromStringRepresenation(string type)
{ {
switch (type.ToLower()) switch (type.ToLower(CultureInfo.CurrentCulture)){
{
case "int": case "int":
return DbType.Int16; return DbType.Int16;
case "int16": case "int16":

3
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfExporter.cs

@ -40,9 +40,8 @@ namespace ICSharpCode.Reporting.Pdf
public void Run (string fileName,bool show) { public void Run (string fileName,bool show) {
string file;
if (String.IsNullOrEmpty(fileName)) { if (String.IsNullOrEmpty(fileName)) {
file = Pages[0].PageInfo.ReportName + ".pdf"; fileName = Pages[0].PageInfo.ReportName + ".pdf";
} }
pdfDocument = new PdfDocument(); pdfDocument = new PdfDocument();
ConvertPagesToPdf(); ConvertPagesToPdf();

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs

@ -53,7 +53,7 @@ namespace ICSharpCode.Reporting
} }
public IReportCreator ReportCreator (ReportModel reportModel) { public IReportCreator ReportCreator (IReportModel reportModel) {
ReportModel = reportModel; ReportModel = reportModel;
var builder = new FormPageBuilder(ReportModel); var builder = new FormPageBuilder(ReportModel);
return builder; return builder;

6
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs

@ -183,7 +183,7 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
} }
DrawingElement CircleVisual(GraphicsContainer circle){ static DrawingElement CircleVisual(GraphicsContainer circle){
var pen = FixedDocumentCreator.CreateWpfPen(circle); var pen = FixedDocumentCreator.CreateWpfPen(circle);
var rad = CalcRadius(circle.Size); var rad = CalcRadius(circle.Size);
@ -199,7 +199,7 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
} }
Border CreateBorder(IExportColumn exportColumn) static Border CreateBorder(IExportColumn exportColumn)
{ {
var border = new Border(); var border = new Border();
border.BorderThickness = Thickness(exportColumn); border.BorderThickness = Thickness(exportColumn);
@ -211,7 +211,7 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
} }
Thickness Thickness(IExportColumn exportColumn) static Thickness Thickness(IExportColumn exportColumn)
{ {
double bT; double bT;
bT = !IsGraphicsContainer(exportColumn) ? 1 : Convert.ToDouble(((GraphicsContainer)exportColumn).Thickness); bT = !IsGraphicsContainer(exportColumn) ? 1 : Convert.ToDouble(((GraphicsContainer)exportColumn).Thickness);

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs

@ -196,7 +196,7 @@ namespace ICSharpCode.Reporting.Xml
} }
} }
void ProcessAttributes(XmlNode node, object ret, Type type) static void ProcessAttributes(XmlNode node, object ret, Type type)
{ {
// process attributes // process attributes
foreach(XmlAttribute attr in node.Attributes) foreach(XmlAttribute attr in node.Attributes)

Loading…
Cancel
Save