Cleanup

Author: PeterForstmeier

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/LineDesigner.cs

@@ -60,7 +60,6 @@ private void OnComponentChanging (object sender,ComponentChangingEventArgs e)
 
 		void OnComponentChanged(object sender,ComponentChangedEventArgs e)
 		{
-			Console.WriteLine("changed");
 			Console.WriteLine("{0}",this.baseLine.ClientRectangle);
 			Control.Invalidate( );
 		}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerGenerator.cs

@@ -55,15 +55,13 @@ public System.Collections.Generic.IEnumerable<OpenedFile> GetSourceFiles(out Ope
 
 		public void MergeFormChanges(System.CodeDom.CodeCompileUnit unit)
 		{
-			System.Diagnostics.Trace.WriteLine("Generator:MergeFormChanges");
 			var writer = InternalMergeFormChanges();
 			viewContent.ReportFileContent = writer.ToString();
 		}
 
 
 		StringWriter InternalMergeFormChanges()
 		{
-				Console.WriteLine("InternalMergeFormChanges create ReportdesignerWriter");
 			var writer = new StringWriterWithEncoding(System.Text.Encoding.UTF8);
 			var xml = XmlHelper.CreatePropperWriter(writer);
 

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

@@ -50,22 +50,18 @@ public InternalReportLoader(IDesignerLoaderHost host,IDesignerGenerator generato
 			if (stream == null) {
 				throw new ArgumentNullException("stream");
 			}
-			Console.WriteLine("---------InternalReportLoader------------");
 			this.host = host;
 			this.generator = generator;
 			this.stream = stream;
 		}
 
 		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 @@ public ReportModel LoadOrCreateReport()
 		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 @@ void UpdateStatusbar ()
 
 		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;
 		}
 	}

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 @@ public  XmlDocument LoadXmlFromStream(Stream stream)
 		}
 
 
-		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 @@ public ReportModel CreateModelFromXml(XmlElement elem)
 		}
 
 
-		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;
 		}

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/ReportDesignerLoader.cs

@@ -24,13 +24,11 @@ public class ReportDesignerLoader: BasicDesignerLoader
 	{
 		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 @@ public override void BeginLoad(IDesignerLoaderHost host){
 
 
 		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 @@ protected override void PerformFlush(IDesignerSerializationManager designerSeria
 
 		public XmlDocument SerializeModel()
 		{
-			Console.WriteLine("ReportDesignerLoader:SerializeModel:");
-		
 			generator.MergeFormChanges((System.CodeDom.CodeCompileUnit)null);
 			var doc = new XmlDocument();
 			doc.LoadXml(generator.ViewContent.ReportFileContent);

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Globals/DesignerGlobals.cs

@@ -30,7 +30,7 @@ public static int GabBetweenSection{
 			get {return 15;}
 		}
 
-		
+		/*
 		public static void DrawString(Graphics graphics,string text,
 		                              Font font,Brush brush,
 		                              RectangleF rectangle,
@@ -46,5 +46,6 @@ public static void DrawString(Graphics graphics,string text,
 			                    rectangle,
 			                    format);
 		}
+		*/
 	}
 }

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Views/DesignerView.cs

@@ -118,7 +118,7 @@ void LoadDesigner (Stream stream) {
 		}	
 
 
-		Panel CreatePanel ()
+		static Panel CreatePanel ()
 		{
 			var ctl = new Panel();
 			ctl.Dock = DockStyle.Fill;
@@ -127,7 +127,7 @@ Panel CreatePanel ()
 		}
 
 
-		DefaultServiceContainer CreateAndInitServiceContainer()
+		static DefaultServiceContainer CreateAndInitServiceContainer()
 		{
 			LoggingService.Debug("ReportDesigner: CreateAndInitServiceContainer...");
 			var serviceContainer = new DefaultServiceContainer();
@@ -347,10 +347,9 @@ void SetupDesignSurface()
 
 		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;
 		}
 

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/ReportDefinitionParser.cs

@@ -229,7 +229,7 @@ void SetPropertyToString(object obj, PropertyInfo pi, string value)
 				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);