From c97c181cd388afa708bd42d1a0b362857ecb3d32 Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Sun, 30 Mar 2014 12:17:26 +0200 Subject: [PATCH] Cleanup --- .../src/Designer/LineDesigner.cs | 1 - .../src/DesignerBinding/DesignerGenerator.cs | 2 -- .../DesignerBinding/InternalReportLoader.cs | 14 +++++-------- .../ReportDefinitionDeserializer.cs | 21 +++---------------- .../DesignerBinding/ReportDesignerLoader.cs | 7 ++----- .../src/Globals/DesignerGlobals.cs | 3 ++- .../src/Views/DesignerView.cs | 7 +++---- .../src/XML/ReportDefinitionParser.cs | 2 +- 8 files changed, 16 insertions(+), 41 deletions(-) diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/LineDesigner.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/LineDesigner.cs index d931205351..a22ecc5df2 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/LineDesigner.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/LineDesigner.cs @@ -60,7 +60,6 @@ namespace ICSharpCode.Reporting.Addin.Designer void OnComponentChanged(object sender,ComponentChangedEventArgs e) { - Console.WriteLine("changed"); Console.WriteLine("{0}",this.baseLine.ClientRectangle); Control.Invalidate( ); } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerGenerator.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerGenerator.cs index 23c65dff98..ea4dcfa3d4 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerGenerator.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerGenerator.cs @@ -55,7 +55,6 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding public void MergeFormChanges(System.CodeDom.CodeCompileUnit unit) { - System.Diagnostics.Trace.WriteLine("Generator:MergeFormChanges"); var writer = InternalMergeFormChanges(); viewContent.ReportFileContent = writer.ToString(); } @@ -63,7 +62,6 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding StringWriter InternalMergeFormChanges() { - Console.WriteLine("InternalMergeFormChanges create ReportdesignerWriter"); var writer = new StringWriterWithEncoding(System.Text.Encoding.UTF8); var xml = XmlHelper.CreatePropperWriter(writer); diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/InternalReportLoader.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/InternalReportLoader.cs index a7e344a96b..ec947b3737 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/InternalReportLoader.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/InternalReportLoader.cs @@ -50,7 +50,6 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding if (stream == null) { throw new ArgumentNullException("stream"); } - Console.WriteLine("---------InternalReportLoader------------"); this.host = host; this.generator = generator; this.stream = stream; @@ -58,14 +57,11 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding public ReportModel LoadOrCreateReport() { - Console.WriteLine("LoadOrCreateReport()"); Application.UseWaitCursor = true; - ReportModel reportModel = null; - var rootComponent = host.CreateComponent(typeof(RootReportModel),"RootReportModel"); var rootControl = rootComponent as RootReportModel; UpdateStatusbar(); - reportModel = CreateNamedSurface(); + var reportModel = CreateNamedSurface(); rootControl.Size = reportModel.ReportSettings.PageSize; Application.UseWaitCursor = false; return reportModel; @@ -75,7 +71,7 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding void UpdateStatusbar () { string message; - if (this.generator.ViewContent.PrimaryFile.IsDirty) { + if (generator.ViewContent.PrimaryFile.IsDirty) { message = String.Format("Create Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName)); } else { message = String.Format("Load Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName)); @@ -86,9 +82,9 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding ReportModel CreateNamedSurface () { - var deserializer = new ReportDefinitionDeserializer(host); - var document = deserializer.LoadXmlFromStream(stream); - var reportModel = deserializer.CreateModelFromXml(document.DocumentElement); + var deserializer = new ReportDefinitionDeserializer(); + var document = ReportDefinitionDeserializer.LoadXmlFromStream(stream); + var reportModel = deserializer.CreateModelFromXml(document.DocumentElement,host); return reportModel; } } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/ReportDefinitionDeserializer.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/ReportDefinitionDeserializer.cs index 25d46216a4..5bd939f324 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/ReportDefinitionDeserializer.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/ReportDefinitionDeserializer.cs @@ -32,19 +32,8 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding { class ReportDefinitionDeserializer : ReportDefinitionParser { - IDesignerHost host; - public ReportDefinitionDeserializer(IDesignerHost host) - { - Console.WriteLine("ReportDefinitionDeserializer"); - if (host == null) { - throw new ArgumentNullException("host"); - } - - this.host = host; - } - - public XmlDocument LoadXmlFromStream(Stream stream) + public static XmlDocument LoadXmlFromStream(Stream stream) { Console.Write("LoadXml"); if (stream == null) @@ -59,12 +48,9 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding } - public ReportModel CreateModelFromXml(XmlElement elem) + public ReportModel CreateModelFromXml(XmlElement elem,IDesignerHost host) { - Console.WriteLine("CreateModelFromXml"); - var reportSettings = CreateReportSettings(elem); - var reportModel = ReportModelFactory.Create(); reportModel.ReportSettings = reportSettings; @@ -86,11 +72,10 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding } - ReportSettings CreateReportSettings(XmlElement elem) + static ReportSettings CreateReportSettings(XmlElement elem) { XmlNodeList nodes = elem.FirstChild.ChildNodes; var reportSettingsNode = (XmlElement)nodes[0]; - Console.Write("ReportDefinitionDeserializer create ModelLoader"); var modelLoader = new ModelLoader(); return modelLoader.Load(reportSettingsNode) as ReportSettings; } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/ReportDesignerLoader.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/ReportDesignerLoader.cs index faf846d0c3..43358c2395 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/ReportDesignerLoader.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/ReportDesignerLoader.cs @@ -24,13 +24,11 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding { IDesignerLoaderHost host; readonly IDesignerGenerator generator; - ReportModel reportModel; Stream stream; #region Constructors public ReportDesignerLoader(IDesignerGenerator generator, Stream stream){ - Console.WriteLine("ReportDesignerLoader:Ctor"); if (stream == null) throw new ArgumentNullException("stream"); if (generator == null) { @@ -58,8 +56,9 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding protected override void PerformLoad(IDesignerSerializationManager serializationManager){ + LoggingService.Info("ReportDesignerLoader:PerformLoad"); var internalLoader = new InternalReportLoader(host,generator, stream); - reportModel = internalLoader.LoadOrCreateReport(); + internalLoader.LoadOrCreateReport(); } @@ -75,8 +74,6 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding public XmlDocument SerializeModel() { - Console.WriteLine("ReportDesignerLoader:SerializeModel:"); - generator.MergeFormChanges((System.CodeDom.CodeCompileUnit)null); var doc = new XmlDocument(); doc.LoadXml(generator.ViewContent.ReportFileContent); diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Globals/DesignerGlobals.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Globals/DesignerGlobals.cs index b8680e4bbd..032e07d4c4 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Globals/DesignerGlobals.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Globals/DesignerGlobals.cs @@ -30,7 +30,7 @@ namespace ICSharpCode.Reporting.Addin.Globals get {return 15;} } - + /* public static void DrawString(Graphics graphics,string text, Font font,Brush brush, RectangleF rectangle, @@ -46,5 +46,6 @@ namespace ICSharpCode.Reporting.Addin.Globals rectangle, format); } + */ } } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Views/DesignerView.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Views/DesignerView.cs index 8079700a75..94f1f9d59b 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Views/DesignerView.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Views/DesignerView.cs @@ -118,7 +118,7 @@ namespace ICSharpCode.Reporting.Addin.Views } - Panel CreatePanel () + static Panel CreatePanel () { var ctl = new Panel(); ctl.Dock = DockStyle.Fill; @@ -127,7 +127,7 @@ namespace ICSharpCode.Reporting.Addin.Views } - DefaultServiceContainer CreateAndInitServiceContainer() + static DefaultServiceContainer CreateAndInitServiceContainer() { LoggingService.Debug("ReportDesigner: CreateAndInitServiceContainer..."); var serviceContainer = new DefaultServiceContainer(); @@ -347,10 +347,9 @@ namespace ICSharpCode.Reporting.Addin.Views void MergeFormChanges() { - System.Diagnostics.Trace.WriteLine("View:MergeFormChanges()"); + LoggingService.Info("MergeFormChanges"); this.designSurface.Flush(); generator.MergeFormChanges(null); - LoggingService.Info("Finished merging form changes"); hasUnmergedChanges = false; } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/ReportDefinitionParser.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/ReportDefinitionParser.cs index 51a88e7309..1a4fdb4787 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/ReportDefinitionParser.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/ReportDefinitionParser.cs @@ -229,7 +229,7 @@ namespace ICSharpCode.Reporting.Addin.XML if (tc.CanConvertFrom(typeof(string))) { object val=tc.ConvertFromInvariantString(value); - Console.WriteLine("\tRDP -> SetPropertyToString {0} - {1}",pi.Name,value.ToString()); +// Console.WriteLine("\tRDP -> SetPropertyToString {0} - {1}",pi.Name,value.ToString()); pi.SetValue(obj, val, null); } else if (pi.PropertyType == typeof(Type)) { pi.SetValue(obj, Type.GetType(value), null);