Code duplications

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs

@@ -23,12 +23,8 @@ namespace ICSharpCode.Reports.Addin
 	{
 		private string imageFileName;
 		private Image image;
-		private bool scaleImageToSize;
 		private GlobalEnums.ImageSource imageSource;
-		private string columnName;
-		private string baseTableName;
 		private string reportFileName;
-		private string relativeFileName;
 		
 		public BaseImageItem()
 		{
@@ -56,7 +52,7 @@ namespace ICSharpCode.Reports.Addin
 			                               this.ClientRectangle.Bottom -1);
 
 			base.DrawControl(graphics,rect);
-			if (this.scaleImageToSize) {
+			if (this.ScaleImageToSize) {
 				graphics.DrawImageUnscaled(this.Image,this.Location.X,this.Location.Y);
 			} else {
 				graphics.DrawImage(this.Image,this.ClientRectangle);
@@ -72,7 +68,7 @@ namespace ICSharpCode.Reports.Addin
 			get { return imageFileName; }
 			set { imageFileName = value;
 				if (!String.IsNullOrEmpty(reportFileName)) {
-					this.relativeFileName = FileUtility.GetRelativePath(Path.GetFullPath(this.reportFileName),Path.GetFullPath(this.ImageFileName));
+					this.RelativeFileName = FileUtility.GetRelativePath(Path.GetFullPath(this.reportFileName),Path.GetFullPath(this.ImageFileName));
 				}
 			}
 		}
@@ -156,10 +152,8 @@ namespace ICSharpCode.Reports.Addin
 		
 		
 		[Category("Layout")]
-		public bool ScaleImageToSize {
-			get { return scaleImageToSize; }
-			set { scaleImageToSize = value; }
-		}
+		public bool ScaleImageToSize {get;set;}
+		
 		
 		
 		[Category("Image")]
@@ -171,22 +165,16 @@ namespace ICSharpCode.Reports.Addin
 		
 		
 		
-		[Category("Image from Database")]
-		public string ColumnName {
-			get { return columnName; }
-			set {
-				columnName = value;
-			}
-		}
+		[Category("DataBinding")]
+		public string ColumnName {get;set;}
 		
 		
-		[Category("Image from Database")]
-		public string BaseTableName {
-			get { return baseTableName; }
-			set {
-				baseTableName = value;
-			}
-		}
+		[Category("DataBinding")]
+		public string BaseTableName {get;set;}
+		
+		
+		[Category("DataBinding")]
+		public string DataType {get;set;}
 		
 		
 		[XmlIgnoreAttribute]
@@ -199,10 +187,8 @@ namespace ICSharpCode.Reports.Addin
 		
 		[Category("Image")]
 		[Browsable(false)]
-		public string RelativeFileName {
-			get { return relativeFileName; }
-			set { relativeFileName = value;}
-		}
+		public string RelativeFileName {get;set;}
+			
 		
 		
 		[XmlIgnoreAttribute]
@@ -211,12 +197,12 @@ namespace ICSharpCode.Reports.Addin
 		public string AbsoluteFileName
 		{
 			get {
-				if (!string.IsNullOrEmpty(relativeFileName)) {
+				if (!string.IsNullOrEmpty(RelativeFileName)) {
 					Console.WriteLine("");
 					
 					string testFileName = String.Empty;
 					if (! String.IsNullOrEmpty(reportFileName)) {
-						testFileName = FileUtility.NormalizePath(Path.Combine(Path.GetDirectoryName(this.reportFileName),this.relativeFileName));
+						testFileName = FileUtility.NormalizePath(Path.Combine(Path.GetDirectoryName(this.reportFileName),this.RelativeFileName));
 					} 
 
 					if (File.Exists(testFileName)){
@@ -225,7 +211,7 @@ namespace ICSharpCode.Reports.Addin
 					} else {
 						Console.WriteLine("AbsoluteFileName can't load image");
 						Console.WriteLine("Report Filename {0}",this.reportFileName);
-						Console.WriteLine("Relative Filename {0}",this.relativeFileName);
+						Console.WriteLine("Relative Filename {0}",this.RelativeFileName);
 						Console.WriteLine("Image Filename {0}",this.ImageFileName);
 					}
 				}
@@ -233,6 +219,8 @@ namespace ICSharpCode.Reports.Addin
 			}
 		}
 		
+		public new string Name {get;set;}
+		
 		#endregion
 	}
 	

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/TypeProviders/ImageItemTypeProvider.cs

@@ -80,6 +80,12 @@ namespace ICSharpCode.Reports.Addin.TypeProviders
 			prop = props.Find("BaseTableName",true);
 			allProperties.Add(prop);
 			
+			prop = props.Find("Name",true);
+			allProperties.Add(prop);
+			
+			prop = props.Find("DataType",true);
+			allProperties.Add(prop);
+			
 			return new PropertyDescriptorCollection(allProperties.ToArray());
 		}
 	}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportWizard/Generators/WizardHelper.cs

@@ -89,21 +89,20 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 			ReportItemCollection destItems = new ReportItemCollection();
 			
 			foreach (DataTable tbl in dataSet.Tables) {
-				foreach (DataColumn col  in tbl.Columns) {
-					if (col.DataType == typeof(System.Byte[])) {
+				foreach (DataColumn col  in tbl.Columns)
+				{
+					if (col.DataType == typeof(System.Byte[]))
+					{
 						ICSharpCode.Reports.Core.BaseImageItem rItem = new ICSharpCode.Reports.Core.BaseImageItem();
+						InitializeItem(rItem,col);
 						rItem.ColumnName = col.ColumnName;
-						rItem.BaseTableName = tbl.TableName;
-						rItem.Name = col.ColumnName;
 						rItem.ScaleImageToSize = false;
 						destItems.Add (rItem);
-					} else {
+					} else
+					{
 						ICSharpCode.Reports.Core.BaseDataItem rItem = new ICSharpCode.Reports.Core.BaseDataItem();
-						rItem.ColumnName = col.ColumnName;
+						InitializeItem(rItem,col);
 						rItem.DBValue = col.ColumnName;
-						rItem.BaseTableName = tbl.TableName;
-						rItem.DataType = col.DataType.ToString();
-						rItem.Name = col.ColumnName;
 						rItem.Text = "=[" + col.ColumnName + "]";
 						destItems.Add (rItem);
 					}
@@ -113,6 +112,16 @@ namespace ICSharpCode.Reports.Addin.ReportWizard
 		}
 		
 		
+		static void  InitializeItem (IDataItem rItem, DataColumn col)
+		{
+			rItem.ColumnName = col.ColumnName;
+			rItem.Name = col.ColumnName;
+			rItem.BaseTableName = col.Table.TableName;
+			rItem.DataType = col.DataType.ToString();
+		}
+		
+		
+		
 		internal static ICSharpCode.Reports.Core.BaseTextItem CreateTextItem (string text)
 		{
 			ICSharpCode.Reports.Core.BaseTextItem textItem = new ICSharpCode.Reports.Core.BaseTextItem();

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs

@@ -26,12 +26,8 @@ namespace ICSharpCode.Reports.Core {
 		
 		private string imageFileName;
 		private Image image;
-		private bool scaleImageToSize;
 		private GlobalEnums.ImageSource imageSource;
 		private string columnName;
-		private string baseTableName;
-		private string reportFileName;
-		private string relativeFileName;
 		
 		public BaseImageItem():base() {
 		}
@@ -49,7 +45,7 @@ namespace ICSharpCode.Reports.Core {
 			}
 			
 			item.Image = this.Image;
-			item.ScaleImageToSize = this.scaleImageToSize;
+			item.ScaleImageToSize = this.ScaleImageToSize;
 			return item;
 		}
 		
@@ -126,7 +122,7 @@ namespace ICSharpCode.Reports.Core {
 				                                   base.DisplayRectangle.Height) );
 			}
 			
-			if (this.scaleImageToSize) {
+			if (this.ScaleImageToSize) {
 				g.DrawImageUnscaled(this.Image,this.Location.X,this.Location.Y);
 				rpea.LocationAfterDraw = new Point (this.Location.X + this.Image.Width,
 				                                    this.Location.Y + this.Image.Height);
@@ -154,20 +150,13 @@ namespace ICSharpCode.Reports.Core {
 		}
 		
 		
-		public string BaseTableName 
-		{
-			get { return baseTableName; }
-			set {
-				baseTableName = value;
-				this.imageSource = GlobalEnums.ImageSource.Database;
-			}
-		}
+		public string BaseTableName {get;set;}
 
 		
 		public string MappingName
 		{
 			get {
-				return baseTableName + "." + columnName;
+				return BaseTableName + "." + columnName;
 			} 
 		}
 		
@@ -192,20 +181,20 @@ namespace ICSharpCode.Reports.Core {
 		public string AbsoluteFileName
 		{
 			get {
-				if (!string.IsNullOrEmpty(relativeFileName)) {
-					string testFileName = FileUtility.NormalizePath(Path.Combine(Path.GetDirectoryName(this.reportFileName),this.relativeFileName));
+				if (!string.IsNullOrEmpty(RelativeFileName)) {
+					string testFileName = FileUtility.NormalizePath(Path.Combine(Path.GetDirectoryName(this.ReportFileName),this.RelativeFileName));
 						
 					if (File.Exists(testFileName)){
 						Console.WriteLine("Image found with Relative Filename");
-						Console.WriteLine("Report Filename {0}",this.reportFileName);
-						Console.WriteLine("Relative Filename {0}",this.relativeFileName);
+						Console.WriteLine("Report Filename {0}",this.ReportFileName);
+						Console.WriteLine("Relative Filename {0}",this.RelativeFileName);
 						Console.WriteLine("Image Filename {0}",this.ImageFileName);
 						return testFileName;
 					
 					} else {
 						Console.WriteLine("AbsoluteFileName can't load image");
-						Console.WriteLine("Report Filename {0}",this.reportFileName);
-						Console.WriteLine("Relative Filename {0}",this.relativeFileName);
+						Console.WriteLine("Report Filename {0}",this.ReportFileName);
+						Console.WriteLine("Relative Filename {0}",this.RelativeFileName);
 						Console.WriteLine("Image Filename {0}",this.ImageFileName);
 					}
 				}
@@ -215,21 +204,10 @@ namespace ICSharpCode.Reports.Core {
 		}
 		
 		
-		public string RelativeFileName 
-		{
-			get { return relativeFileName; }
-			set { relativeFileName = value; }
-		}
+		public string RelativeFileName {get;set;}
 		
 		
-
-		public string ReportFileName 
-		{
-			get { return reportFileName; }
-			set { 
-				reportFileName = value; 
-			}
-		}
+		public string ReportFileName {get;set;}
 		
 		
 		/// <summary>
@@ -270,15 +248,7 @@ namespace ICSharpCode.Reports.Core {
 		///<summary>
 		/// enlarge / Shrink the Controls Size
 		/// </summary>
-		public bool ScaleImageToSize
-		{
-			get {
-				return scaleImageToSize;
-			}
-			set {
-				scaleImageToSize = value;
-			}
-		}
+		public bool ScaleImageToSize{get;set;}
 		
 		
 		public override Color BackColor {
@@ -310,6 +280,8 @@ namespace ICSharpCode.Reports.Core {
 			set { base.Thickness = value; }
 		}
 		
+		public string DataType {get;set;}
+		
 		#endregion
 		
 	}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs

@@ -20,11 +20,11 @@ namespace ICSharpCode.Reports.Core {
 	public class BaseLineItem : BaseGraphicItem,IExportColumnBuilder {
 		
 		private LineShape shape  = new LineShape();
-		private Point fromPoint;
-		private Point toPoint;
-		private LineCap startLineCap;
-		private LineCap endLineCap;
-		private DashCap dashLineCap;
+//		private Point fromPoint;
+//		private Point toPoint;
+//		private LineCap startLineCap;
+//		private LineCap endLineCap;
+//		private DashCap dashLineCap;
 		
 		#region Constructor
 		
@@ -55,19 +55,19 @@ namespace ICSharpCode.Reports.Core {
 			
 			decorator.Thickness = base.Thickness;
 			decorator.DashStyle = base.DashStyle;
-			decorator.From = this.fromPoint;
-			decorator.To = this.toPoint;
+			decorator.From = this.FromPoint;
+			decorator.To = this.ToPoint;
 			return decorator;
 		}
 		
 		Size CalculateLineSize()
 		{
 			int dif = 0;
-			if (fromPoint.Y < toPoint.Y) {
+			if (FromPoint.Y < ToPoint.Y) {
 				//
-				dif = toPoint.Y - fromPoint.Y;
+				dif = ToPoint.Y - FromPoint.Y;
 			} else {
-				dif = fromPoint.Y - toPoint.Y;
+				dif = FromPoint.Y - ToPoint.Y;
 			}
 			return new Size (Size.Width, dif + ICSharpCode.Reports.Core.Globals.GlobalValues.GapBetweenContainer);
 		}
@@ -84,10 +84,10 @@ namespace ICSharpCode.Reports.Core {
 			shape.DrawShape (rpea.PrintPageEventArgs.Graphics,
 			                 new BaseLine (this.ForeColor,base.DashStyle,
 			                               base.Thickness,
-			                               this.startLineCap,
-			                               this.endLineCap,
-			                               this.dashLineCap),
-			                 new Point(base.DisplayRectangle.Left + this.fromPoint.X,
+			                               this.StartLineCap,
+			                               this.EndLineCap,
+			                               this.DashLineCap),
+			                 new Point(base.DisplayRectangle.Left + this.FromPoint.X,
 			                           this.FromPoint.Y + base.DisplayRectangle.Top),
 			                 new Point (base.DisplayRectangle.Left + this.ToPoint.X,
 			                            this.ToPoint.Y + base.DisplayRectangle.Top));
@@ -100,39 +100,15 @@ namespace ICSharpCode.Reports.Core {
 			return "BaseLineItem";
 		}
 		
-		public virtual Point FromPoint {
-			get { 
-				return this.fromPoint;
-			}
-			set { 
-				fromPoint = value;
-			}
-		}
-		
-		
-		public virtual Point ToPoint {
-			get {
-				return this.toPoint;
-			}
-			set {
-				toPoint = value;
-			}
-		}
+		public virtual Point FromPoint {get;set;}
 		
+		public virtual Point ToPoint {get;set;}
+			
+		public LineCap StartLineCap {get;set;}
 		
-		public LineCap StartLineCap {
-			get { return startLineCap; }
-			set { startLineCap = value; }
-		}
+		public LineCap EndLineCap {get;set;}
 		
-		public LineCap EndLineCap {
-			get { return endLineCap; }
-			set { endLineCap = value; }
-		}
+		public DashCap DashLineCap {get;set;}
 		
-		public DashCap DashLineCap {
-			get { return dashLineCap; }
-			set { dashLineCap = value; }
-		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IDataItem.cs

@@ -24,5 +24,7 @@ namespace ICSharpCode.Reports.Core
 		string MappingName { get; }
 		string BaseTableName { get; set; }
 		string DBValue {get;set;}
+		string Name {get;set;}
+		string DataType {get;set;}
 	}
 }