From 18f420ac1d9233501e6f4074d340075c41e436dc Mon Sep 17 00:00:00 2001
From: Peter Forstmeier <peter.forstmeier@t-online.de>
Date: Sat, 20 Sep 2014 20:10:41 +0200
Subject: [PATCH] Cleanup

---
 .../src/ReportWizard/ReportGenerator.cs       | 47 +++++++++----------
 .../Src/Items/BaseSection.cs                  |  2 -
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ReportGenerator.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ReportGenerator.cs
index 4c3b025d8c..b2b09e3812 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ReportGenerator.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ReportGenerator.cs
@@ -82,37 +82,19 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard
 				Location = new Point(5,5),
 				Size = new Size(ReportModel.ReportSettings.PrintableWidth() - 10,GlobalValues.PreferedSize.Height * 2)
 			};
-			
-			foreach (var element in pushModelContext.Items) {
-				var dataItem = new BaseDataItem(){
-					Name = element.ColumnName,
-					Text = element.ColumnName,
-					ColumnName = element.ColumnName,
-					DataType = element.DataTypeName
-				};
-				row.Items.Add(dataItem);
-			}
-				
-			AdjustItems(row.Items,startLocation);
+			var list = CreateItems(pushModelContext);
+			row.Items.AddRange(list); 
 			ReportModel.DetailSection.Items.Add(row);
 		}
 		
 		
 		void CreateDetailsSection(ReportWizardContext context){
 			var pushModelContext = (PushModelContext)context.PushModelContext;
-			foreach (var element in pushModelContext.Items) {
-				var dataItem = new BaseDataItem(){
-					Name = element.ColumnName,
-					Text = element.ColumnName,
-					ColumnName = element.ColumnName,
-					DataType = element.DataTypeName
-				};
-				ReportModel.DetailSection.Items.Add(dataItem);
-			}
-			AdjustItems(ReportModel.DetailSection.Items,startLocation);
+			var list = CreateItems(pushModelContext);
+			ReportModel.DetailSection.Items.AddRange(list);
 		}
 		
-		
+	
 		void CreateReportHeader(ReportWizardContext context){
 			var pageOneContext = (PageOneContext)context.PageOneContext;
 			
@@ -173,7 +155,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard
 		}
 		
 		
-		void AdjustItems (List<IPrintableObject> list,int startValue ) {
+		static void AdjustItems (List<IPrintableObject> list,int startValue ) {
 		
 			var xLocation = startValue;
 			foreach (var element in list) {
@@ -182,6 +164,23 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard
 			}
 		}
 		
+		
+		static List<IPrintableObject> CreateItems(PushModelContext context) {
+			var list = new List<IPrintableObject>();
+			foreach (var element in context.Items) {
+				var dataItem = new BaseDataItem(){
+					Name = element.ColumnName,
+					Text = element.ColumnName,
+					ColumnName = element.ColumnName,
+					DataType = element.DataTypeName
+				};
+				list.Add(dataItem);
+			}
+			AdjustItems(list,startLocation);
+			return list;
+		}
+		
+		
 		static bool IsDataReport(ReportWizardContext context)
 		{
 			var poc = (PageOneContext)context.PageOneContext;
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseSection.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseSection.cs
index 2bfa2a8455..61db26072a 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseSection.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/BaseSection.cs
@@ -17,8 +17,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Drawing;
-using ICSharpCode.Reporting.Interfaces;
 
 namespace ICSharpCode.Reporting.Items
 {