Browse Source

Remove obsolete methods in ReportViewer.cs

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@5869 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Peter Forstmeier 16 years ago
parent
commit
978d5557fa
  1. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs
  2. 1
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs
  3. 61
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs

@ -59,7 +59,7 @@ namespace ICSharpCode.Reports.Addin
// manipulate reportSettings if Filename differs // manipulate reportSettings if Filename differs
this.reportSettings = baseItemLoader.Load(rse) as ReportSettings; this.reportSettings = baseItemLoader.Load(rse) as ReportSettings;
if (this.reportSettings.FileName != file.FileName) { if (this.reportSettings.FileName.CompareTo(file.FileName) != 0) {
System.Diagnostics.Trace.WriteLine("LoadObjectFromXmlDocument - filename changed" ); System.Diagnostics.Trace.WriteLine("LoadObjectFromXmlDocument - filename changed" );
this.reportSettings.FileName = file.FileName; this.reportSettings.FileName = file.FileName;
} }

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

@ -33,6 +33,7 @@ namespace ICSharpCode.Reports.Core
} }
#region overrides #region overrides
internal override void ReportBegin(object sender, PrintEventArgs pea) internal override void ReportBegin(object sender, PrintEventArgs pea)
{ {
base.ReportBegin(sender, pea); base.ReportBegin(sender, pea);

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

@ -39,7 +39,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
private delegate void invokeDelegate(); private delegate void invokeDelegate();
private ReportSettings reportSettings; private ReportSettings reportSettings;
private IDataManager dataManager; private IDataManager dataManager;
// private string pagesCreatedMessage;
#region Constructor #region Constructor
@ -80,6 +80,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
#endregion #endregion
public void RunReport (string fileName,ReportParameters parameters) public void RunReport (string fileName,ReportParameters parameters)
{ {
if (String.IsNullOrEmpty(fileName)) { if (String.IsNullOrEmpty(fileName)) {
@ -89,18 +90,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer
this.RunReport(model,parameters); this.RunReport(model,parameters);
} }
[Obsolete("Use RunReport (string fileName,ReportParameters parameters)" )]
public void SetupAsynchron (string fileName,ReportParameters parameters)
{
if (String.IsNullOrEmpty(fileName)) {
throw new ArgumentNullException("fileName");
}
ReportModel m = ReportEngine.LoadReportModel(fileName);
RunReport(m,parameters);
}
public void RunReport (ReportModel reportModel,ReportParameters parameters) public void RunReport (ReportModel reportModel,ReportParameters parameters)
{ {
@ -119,28 +108,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer
} }
} }
[Obsolete("Use RunReport (reportModel,parameters)")]
public void SetupAsynchron (ReportModel reportModel,ReportParameters parameters)
{
RunReport (reportModel,parameters);
/*
if (reportModel == null) {
throw new ArgumentNullException("reportModel");
}
this.SetupViewer(reportModel);
if (reportModel.DataModel == GlobalEnums.PushPullModel.FormSheet) {
RunFormSheet(reportModel);
} else {
ReportEngine.CheckForParameters(reportModel,parameters);
this.dataManager = DataManagerFactory.CreateDataManager(reportModel,parameters);
RunDataReport (reportModel,dataManager);
}
*/
}
public void RunReport (ReportModel reportModel,DataTable dataTable,ReportParameters parameters) public void RunReport (ReportModel reportModel,DataTable dataTable,ReportParameters parameters)
{ {
@ -154,22 +121,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer
} }
[Obsolete("Use RunReport(reportModel,dataTable,parameters)")]
public void SetupAsynchron (ReportModel reportModel,DataTable dataTable,ReportParameters parameters)
{
RunReport(reportModel,dataTable,parameters);
/*
if (reportModel == null) {
throw new ArgumentNullException("reportModel");
}
if (dataTable == null) {
throw new ArgumentNullException("dataTable");
}
SetupAsynchron (reportModel,DataManagerFactory.CreateDataManager(reportModel,dataTable));
*/
}
public void RunReport (ReportModel reportModel,IDataManager dataManager) public void RunReport (ReportModel reportModel,IDataManager dataManager)
{ {
if (reportModel == null) { if (reportModel == null) {
@ -184,14 +135,6 @@ namespace ICSharpCode.Reports.Core.ReportViewer
RunDataReport(reportModel,dataManager); RunDataReport(reportModel,dataManager);
} }
[Obsolete("Use RunReport(reportModel,dataManager)")]
public void SetupAsynchron (ReportModel reportModel,IDataManager dataManager)
{
RunReport(reportModel,dataManager);
}
#region Rendering #region Rendering
private void RunFormSheet (ReportModel reportModel) private void RunFormSheet (ReportModel reportModel)

Loading…
Cancel
Save